diff options
| -rw-r--r-- | src/Makefile.am | 32 | ||||
| -rw-r--r-- | src/caja-query-editor.c | 4 | ||||
| -rw-r--r-- | src/caja-window.c | 6 |
3 files changed, 34 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index c929e6d3..21de26ee 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -52,6 +52,11 @@ desktopdir = $(datadir)/mate/network/ schemedir = $(datadir)/applications scheme_DATA = mate-network-scheme.desktop +BUILT_SOURCES = \ + caja-src-marshal.c \ + caja-src-marshal.h \ + $(NULL) + caja_SOURCES = \ caja-actions.h \ caja-application.c \ @@ -141,6 +146,28 @@ caja_SOURCES = \ caja-zoom-control.h \ $(NULL) +nodist_caja_SOURCES = \ + $(BUILT_SOURCES) \ + $(NULL) + +caja-src-marshal.list: $(caja_SOURCES) Makefile.am + $(AM_V_GEN)( cd $(srcdir) && \ + sed -n -e 's/.*caja_src_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \ + $(caja_SOURCES) ) \ + | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > [email protected] + @if cmp -s [email protected] $@; then \ + rm [email protected]; \ + else \ + mv [email protected] $@; \ + fi + +%-marshal.c: %-marshal.list Makefile + $(AM_V_GEN)echo "#include \"caja-src-marshal.h\"" > $@ && \ + $(GLIB_GENMARSHAL) --body --prefix=$(subst -,_,$*)_marshal $< >> $*-marshal.c + +%-marshal.h: %-marshal.list Makefile + $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=$(subst -,_,$*)_marshal $< > $*-marshal.h + caja_file_management_properties_SOURCES = \ caja-file-management-properties.c \ caja-file-management-properties.h \ @@ -179,19 +206,18 @@ ui_DATA = \ $(NULL) CLEANFILES = \ + $(BUILT_SOURCES) \ $(desktop_files) \ $(server_DATA) \ $(NULL) EXTRA_DIST = \ + caja-src-marshal.list \ $(server_in_files) \ $(ui_DATA) \ check-caja \ $(desktop_in_files) \ $(NULL) -BUILT_SOURCES = \ - $(NULL) - dist-hook: cd $(distdir); rm -f $(CLEANFILES) diff --git a/src/caja-query-editor.c b/src/caja-query-editor.c index dab9e329..dcd4416a 100644 --- a/src/caja-query-editor.c +++ b/src/caja-query-editor.c @@ -23,10 +23,10 @@ #include <config.h> #include "caja-query-editor.h" +#include "caja-src-marshal.h" #include "caja-window-slot.h" #include <string.h> -#include <libcaja-private/caja-marshal.h> #include <glib/gi18n.h> #include <gio/gio.h> #include <eel/eel-gtk-macros.h> @@ -197,7 +197,7 @@ caja_query_editor_class_init (CajaQueryEditorClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (CajaQueryEditorClass, changed), NULL, NULL, - caja_marshal_VOID__OBJECT_BOOLEAN, + caja_src_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2, CAJA_TYPE_QUERY, G_TYPE_BOOLEAN); signals[CANCEL] = diff --git a/src/caja-window.c b/src/caja-window.c index 8e9ed5bb..ebe25a57 100644 --- a/src/caja-window.c +++ b/src/caja-window.c @@ -40,6 +40,7 @@ #include "caja-zoom-control.h" #include "caja-search-bar.h" #include "caja-navigation-window-pane.h" +#include "caja-src-marshal.h" #include <eel/eel-debug.h> #include <eel/eel-marshal.h> #include <eel/eel-gtk-macros.h> @@ -57,7 +58,6 @@ #include <libcaja-private/caja-global-preferences.h> #include <libcaja-private/caja-horizontal-splitter.h> #include <libcaja-private/caja-metadata.h> -#include <libcaja-private/caja-marshal.h> #include <libcaja-private/caja-mime-actions.h> #include <libcaja-private/caja-program-choosing.h> #include <libcaja-private/caja-view-factory.h> @@ -2117,7 +2117,7 @@ caja_window_class_init (CajaWindowClass *class) G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (CajaWindowClass, go_up), g_signal_accumulator_true_handled, NULL, - eel_marshal_BOOLEAN__BOOLEAN, + caja_src_marshal_BOOLEAN__BOOLEAN, G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN); signals[RELOAD] = g_signal_new ("reload", @@ -2141,7 +2141,7 @@ caja_window_class_init (CajaWindowClass *class) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - caja_marshal_VOID__INT_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN, + caja_src_marshal_VOID__INT_BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN, G_TYPE_NONE, 5, G_TYPE_INT, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN); |