diff options
| -rw-r--r-- | ChangeLog | 20 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/debug/debugger.c | 2 | ||||
| -rw-r--r-- | src/glibext/Makefile.am | 11 | ||||
| -rw-r--r-- | src/glibext/gcodebuffer.c | 2 | ||||
| -rw-r--r-- | src/gtkext/Makefile.am | 11 | ||||
| -rw-r--r-- | src/gtkext/gtkdockstation.c | 2 | ||||
| -rw-r--r-- | src/gtkext/gtkviewpanel.c | 2 |
8 files changed, 36 insertions, 16 deletions
@@ -1,3 +1,23 @@ +12-12-16 Cyrille Bagard <nocbos@gmail.com> + + * configure.ac: + Change the output filename for the GLib marshals. + + * src/debug/debugger.c: + * src/glibext/gcodebuffer.c: + Update code. + + * src/glibext/Makefile.am: + Fix the compilation by processing the GLib marshals sooner (glibext is + built before gtkext). + + * src/gtkext/gtkdockstation.c: + * src/gtkext/gtkviewpanel.c: + Update code. + + * src/gtkext/Makefile.am: + Remove the old compilation rules. + 12-12-13 Cyrille Bagard <nocbos@gmail.com> * plugins/pychrysa/gui/panels/panel.c: diff --git a/configure.ac b/configure.ac index 0b2b421..34aff02 100644 --- a/configure.ac +++ b/configure.ac @@ -229,7 +229,7 @@ AC_SUBST(LIBGRAPH_LIBS) AC_CONFIG_FILES([stamp-h po/Makefile.in], [echo timestamp > stamp-h]) -AC_CONFIG_COMMANDS([marshal], [echo -e "VOID:UINT64,UINT64\nVOID:INT,UINT64,INT\nVOID:OBJECT\nVOID:OBJECT,OBJECT" > src/gtkext/iodamarshal.list]) +AC_CONFIG_COMMANDS([marshal], [echo -e "VOID:UINT64,UINT64\nVOID:INT,UINT64,INT\nVOID:OBJECT\nVOID:OBJECT,OBJECT" > src/glibext/chrysamarshal.list]) AC_CONFIG_FILES([Makefile pixmaps/Makefile diff --git a/src/debug/debugger.c b/src/debug/debugger.c index 19f4f65..7e7fbbe 100644 --- a/src/debug/debugger.c +++ b/src/debug/debugger.c @@ -26,7 +26,7 @@ #include "debugger-int.h" #include "jdwp/debugger.h" #include "remgdb/gdb.h" -#include "../gtkext/iodamarshal.h" +#include "../glibext/chrysamarshal.h" #include "../plugins/pglist.h" diff --git a/src/glibext/Makefile.am b/src/glibext/Makefile.am index d5235c8..b6f100b 100644 --- a/src/glibext/Makefile.am +++ b/src/glibext/Makefile.am @@ -1,7 +1,10 @@ +BUILT_SOURCES = chrysamarshal.h chrysamarshal.c + noinst_LTLIBRARIES = libglibext.la libglibext_la_SOURCES = \ + chrysamarshal.h chrysamarshal.c \ delayed-int.h \ delayed.h delayed.c \ gbufferline.h gbufferline.c \ @@ -21,3 +24,11 @@ AM_CPPFLAGS = AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) SUBDIRS = + + +chrysamarshal.h: chrysamarshal.list + glib-genmarshal --header $< > $@ + +chrysamarshal.c: chrysamarshal.list + echo "#include <$(subst .c,.h,$@)>" > $@ + glib-genmarshal --body $< >> $@ diff --git a/src/glibext/gcodebuffer.c b/src/glibext/gcodebuffer.c index 452d695..1f1ff71 100644 --- a/src/glibext/gcodebuffer.c +++ b/src/glibext/gcodebuffer.c @@ -28,8 +28,8 @@ #include <string.h> +#include "chrysamarshal.h" #include "delayed-int.h" -#include "../gtkext/iodamarshal.h" diff --git a/src/gtkext/Makefile.am b/src/gtkext/Makefile.am index 863c7a8..6478b87 100644 --- a/src/gtkext/Makefile.am +++ b/src/gtkext/Makefile.am @@ -1,6 +1,4 @@ -BUILT_SOURCES = iodamarshal.h iodamarshal.c - noinst_LTLIBRARIES = libgtkext.la libgtkext_la_SOURCES = \ @@ -15,7 +13,6 @@ libgtkext_la_SOURCES = \ gtksourceview.h gtksourceview.c \ gtkviewpanel-int.h \ gtkviewpanel.h gtkviewpanel.c \ - iodamarshal.h iodamarshal.c \ support.h support.c libgtkext_la_LIBADD = \ @@ -31,11 +28,3 @@ AM_CPPFLAGS = AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) SUBDIRS = graph - - -iodamarshal.h: iodamarshal.list - glib-genmarshal --header $< > $@ - -iodamarshal.c: iodamarshal.list - echo "#include <$(subst .c,.h,$@)>" > $@ - glib-genmarshal --body $< >> $@ diff --git a/src/gtkext/gtkdockstation.c b/src/gtkext/gtkdockstation.c index 2a0d188..68c8e1d 100644 --- a/src/gtkext/gtkdockstation.c +++ b/src/gtkext/gtkdockstation.c @@ -29,9 +29,9 @@ #include "easygtk.h" -#include "iodamarshal.h" #include "../params.h" #include "../common/extstr.h" +#include "../glibext/chrysamarshal.h" diff --git a/src/gtkext/gtkviewpanel.c b/src/gtkext/gtkviewpanel.c index ab0f237..97897a8 100644 --- a/src/gtkext/gtkviewpanel.c +++ b/src/gtkext/gtkviewpanel.c @@ -25,7 +25,7 @@ #include "gtkviewpanel-int.h" -#include "iodamarshal.h" +#include "../glibext/chrysamarshal.h" |