Small cleanup

[evince.git] / cut-n-paste / toolbar-editor / Makefile.am

diff --git a/cut-n-paste/toolbar-editor/Makefile.am b/cut-n-paste/toolbar-editor/Makefile.am
index 2d1614c6d6869498c346edc5abcfdf65713d6bb2..b3e843ec6e7288bc9b6a4ed14ee43b7686ca4abf 100644 (file)
--- a/cut-n-paste/toolbar-editor/Makefile.am
+++ b/cut-n-paste/toolbar-editor/Makefile.am
@@ -20,11 +20,10 @@ libtoolbareditor_la_SOURCES =       \
        $(EGGHEADERS) 
 
 libtoolbareditor_la_CPPFLAGS = \
-       -I$(top_builddir)/lib/egg               \
        $(AM_CPPFLAGS)
 
 libtoolbareditor_la_CFLAGS = \
-       $(LIB_CFLAGS)                           \
+       $(SHELL_CORE_CFLAGS)                    \
        $(WARN_CFLAGS)                          \
        $(DISABLE_DEPRECATED)                   \
        -DCURSOR_DIR=\"$(pkgdatadir)\"          \
@@ -45,19 +44,20 @@ stamp_files = \
 eggmarshalers.h: stamp-eggmarshalers.h
        @true
 stamp-eggmarshalers.h: eggmarshalers.list
-       $(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --header > eggmarshalers.h \
+       $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --header > eggmarshalers.h \
        && echo timestamp > $(@F)
 
 eggmarshalers.c: stamp-eggmarshalers.c
        @true
 stamp-eggmarshalers.c: eggmarshalers.list
-       $(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --header --body > eggmarshalers.c \
+       $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --header --body > eggmarshalers.c \
        && echo timestamp > $(@F)
 
 eggtypebuiltins.c: stamp-eggtypebuiltins.c
        @true
 stamp-eggtypebuiltins.c: $(EGGHEADERS)
-       ( cd $(srcdir) && $(GLIB_MKENUMS) \
+       $(AM_V_GEN)( cd $(srcdir) && $(GLIB_MKENUMS) \
+               --fhead "#include <config.h>\n\n" \
                --fhead "#include \"eggtypebuiltins.h\"\n\n" \
                --fprod "\n/* enumerations from \"@filename@\" */" \
                --fprod "\n#include \"@filename@\"" \
@@ -77,7 +77,7 @@ stamp-eggtypebuiltins.c: $(EGGHEADERS)
 eggtypebuiltins.h: stamp-eggtypebuiltins.h
        @true
 stamp-eggtypebuiltins.h: $(EGGHEADERS)
-       ( cd $(srcdir) && $(GLIB_MKENUMS) \
+       $(AM_V_GEN)( cd $(srcdir) && $(GLIB_MKENUMS) \
                --fhead "#ifndef __EGGTYPEBUILTINS_H__\n" \
                --fhead "#define __EGGTYPEBUILTINS_H__ 1\n\n" \
                --fhead "#include <glib-object.h>\n\n" \
@@ -104,3 +104,5 @@ regenerate-built-sources:
 CLEANFILES = $(stamp_files) $(BUILT_SOURCES)
 DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
 MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk