From f8a0165d07b14ac0c877e638c86e0dc0a8905d8f Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Thu, 22 Oct 2009 09:52:50 +0000 Subject: [build] Include git.mk in all Makefiles --- diff --git a/Makefile.am b/Makefile.am index 011d1fc..7880c3a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = \ cut-n-paste \ data \ @@ -53,9 +55,35 @@ DISTCLEANFILES = \ intltool-merge \ intltool-update -ACLOCAL_AMFLAGS = -I m4 - -DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper --enable-gtk-doc --disable-nautilus --disable-tests +MAINTAINERCLEANFILES = \ + ChangeLog \ + $(srcdir)/INSTALL \ + $(srcdir)/aclocal.m4 \ + $(srcdir)/autoscan.log \ + $(srcdir)/compile \ + $(srcdir)/config.guess \ + $(srcdir)/config.h.in \ + $(srcdir)/config.sub \ + $(srcdir)/configure \ + $(srcdir)/configure.scan \ + $(srcdir)/depcomp \ + $(srcdir)/install-sh \ + $(srcdir)/ltmain.sh \ + $(srcdir)/missing \ + $(srcdir)/mkinstalldirs \ + $(srcdir)/omf.make \ + $(srcdir)/xmldocs.make \ + $(srcdir)/gtk-doc.make \ + $(srcdir)/po/Makefile.in.in \ + `find "$(srcdir)" -type f -name Makefile.in -print` + +DISTCHECK_CONFIGURE_FLAGS = \ + --disable-schemas-install \ + --disable-scrollkeeper \ + --enable-gtk-doc \ + --disable-nautilus \ + --disable-tests \ + --disable-silent-rules # Ignore scrollkeeper issues for now. @#*$& scrollkeeper distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper | grep -v /share/gnome/help/ | grep -v \.omf @@ -66,8 +94,7 @@ distclean-local: fi ChangeLog: - @echo Creating $@ - @if test -d "$(srcdir)/.git"; then \ + $(AM_V_GEN) if test -d "$(srcdir)/.git"; then \ (GIT_DIR=$(top_srcdir)/.git ./missing --run git log -M -C --name-status --date=short --no-color) | fmt --split-only > $@.tmp \ && mv -f $@.tmp $@ \ || ($(RM) $@.tmp; \ @@ -80,3 +107,5 @@ ChangeLog: fi .PHONY: ChangeLog + +-include $(top_srcdir)/git.mk diff --git a/backend/Makefile.am b/backend/Makefile.am index dcbbc0e..a6dc6e5 100644 --- a/backend/Makefile.am +++ b/backend/Makefile.am @@ -36,3 +36,5 @@ endif EXTRA_DIST = \ backend.symbols + +-include $(top_srcdir)/git.mk diff --git a/backend/comics/Makefile.am b/backend/comics/Makefile.am index eae62f4..3d56cd7 100644 --- a/backend/comics/Makefile.am +++ b/backend/comics/Makefile.am @@ -28,3 +28,5 @@ EXTRA_DIST = $(backend_in_files) CLEANFILES = $(backend_DATA) @EV_INTLTOOL_EVINCE_BACKEND_RULE@ + +-include $(top_srcdir)/git.mk diff --git a/backend/djvu/Makefile.am b/backend/djvu/Makefile.am index 4c39d2d..fbd4bde 100644 --- a/backend/djvu/Makefile.am +++ b/backend/djvu/Makefile.am @@ -34,3 +34,5 @@ EXTRA_DIST = $(backend_in_files) CLEANFILES = $(backend_DATA) @EV_INTLTOOL_EVINCE_BACKEND_RULE@ + +-include $(top_srcdir)/git.mk diff --git a/backend/dvi/Makefile.am b/backend/dvi/Makefile.am index 0e27e11..93aad73 100644 --- a/backend/dvi/Makefile.am +++ b/backend/dvi/Makefile.am @@ -41,3 +41,5 @@ EXTRA_DIST = $(backend_in_files) CLEANFILES = $(backend_DATA) @EV_INTLTOOL_EVINCE_BACKEND_RULE@ + +-include $(top_srcdir)/git.mk diff --git a/backend/dvi/mdvi-lib/Makefile.am b/backend/dvi/mdvi-lib/Makefile.am index 0a09e20..e976aa6 100644 --- a/backend/dvi/mdvi-lib/Makefile.am +++ b/backend/dvi/mdvi-lib/Makefile.am @@ -39,3 +39,5 @@ libmdvi_la_SOURCES = \ util.c \ vf.c + +-include $(top_srcdir)/git.mk diff --git a/backend/impress/Makefile.am b/backend/impress/Makefile.am index 8057dfc..c1da9a1 100644 --- a/backend/impress/Makefile.am +++ b/backend/impress/Makefile.am @@ -53,3 +53,5 @@ EXTRA_DIST = $(backend_in_files) CLEANFILES = $(backend_DATA) @EV_INTLTOOL_EVINCE_BACKEND_RULE@ + +-include $(top_srcdir)/git.mk diff --git a/backend/pdf/Makefile.am b/backend/pdf/Makefile.am index 1d2115a..85bbcef 100644 --- a/backend/pdf/Makefile.am +++ b/backend/pdf/Makefile.am @@ -30,3 +30,5 @@ EXTRA_DIST = $(backend_in_files) CLEANFILES = $(backend_DATA) @EV_INTLTOOL_EVINCE_BACKEND_RULE@ + +-include $(top_srcdir)/git.mk diff --git a/backend/pixbuf/Makefile.am b/backend/pixbuf/Makefile.am index 73beba3..e31a8bb 100644 --- a/backend/pixbuf/Makefile.am +++ b/backend/pixbuf/Makefile.am @@ -26,3 +26,5 @@ EXTRA_DIST = $(backend_in_files) CLEANFILES = $(backend_DATA) @EV_INTLTOOL_EVINCE_BACKEND_RULE@ + +-include $(top_srcdir)/git.mk diff --git a/backend/ps/Makefile.am b/backend/ps/Makefile.am index 9fa6252..fdc83bc 100644 --- a/backend/ps/Makefile.am +++ b/backend/ps/Makefile.am @@ -28,3 +28,5 @@ EXTRA_DIST = $(backend_in_files) CLEANFILES = $(backend_DATA) @EV_INTLTOOL_EVINCE_BACKEND_RULE@ + +-include $(top_srcdir)/git.mk diff --git a/backend/tiff/Makefile.am b/backend/tiff/Makefile.am index 81fc9bf..7272267 100644 --- a/backend/tiff/Makefile.am +++ b/backend/tiff/Makefile.am @@ -29,3 +29,5 @@ EXTRA_DIST = $(backend_in_files) CLEANFILES = $(backend_DATA) @EV_INTLTOOL_EVINCE_BACKEND_RULE@ + +-include $(top_srcdir)/git.mk diff --git a/cut-n-paste/Makefile.am b/cut-n-paste/Makefile.am index f073fd9..c0cf0cc 100644 --- a/cut-n-paste/Makefile.am +++ b/cut-n-paste/Makefile.am @@ -1 +1,3 @@ SUBDIRS = zoom-control toolbar-editor totem-screensaver evinfobar smclient gimpcellrenderertoggle + +-include $(top_srcdir)/git.mk diff --git a/cut-n-paste/evinfobar/Makefile.am b/cut-n-paste/evinfobar/Makefile.am index 61d3ed2..46f4e43 100644 --- a/cut-n-paste/evinfobar/Makefile.am +++ b/cut-n-paste/evinfobar/Makefile.am @@ -7,3 +7,5 @@ libevinfobar_la_CFLAGS = \ $(SHELL_CORE_CFLAGS) \ $(WARNING_CFLAGS) \ $(DISABLE_DEPRECATED) + +-include $(top_srcdir)/git.mk diff --git a/cut-n-paste/gimpcellrenderertoggle/Makefile.am b/cut-n-paste/gimpcellrenderertoggle/Makefile.am index 65580e0..fffeffa 100644 --- a/cut-n-paste/gimpcellrenderertoggle/Makefile.am +++ b/cut-n-paste/gimpcellrenderertoggle/Makefile.am @@ -34,3 +34,5 @@ gen_sources = xgen-wmh xgen-wmc $(libgimpcellrenderertoggle_la_built_sources) CLEANFILES = $(gen_sources) EXTRA_DIST = $(libgimpcellrenderertoggle_la_extra_sources) + +-include $(top_srcdir)/git.mk diff --git a/cut-n-paste/smclient/Makefile.am b/cut-n-paste/smclient/Makefile.am index 71187b6..498ed75 100644 --- a/cut-n-paste/smclient/Makefile.am +++ b/cut-n-paste/smclient/Makefile.am @@ -38,3 +38,5 @@ libsmclient_la_SOURCES += eggsmclient-osx.c endif endif # WITH_SMCLIENT + +-include $(top_srcdir)/git.mk diff --git a/cut-n-paste/toolbar-editor/Makefile.am b/cut-n-paste/toolbar-editor/Makefile.am index a5600f9..b3e843e 100644 --- a/cut-n-paste/toolbar-editor/Makefile.am +++ b/cut-n-paste/toolbar-editor/Makefile.am @@ -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 diff --git a/cut-n-paste/totem-screensaver/Makefile.am b/cut-n-paste/totem-screensaver/Makefile.am index ab67e2c..0b69f36 100644 --- a/cut-n-paste/totem-screensaver/Makefile.am +++ b/cut-n-paste/totem-screensaver/Makefile.am @@ -8,3 +8,5 @@ libtotemscrsaver_la_CFLAGS = \ $(DBUS_CFLAGS) \ $(WARNING_CFLAGS) \ $(DISABLE_DEPRECATED) + +-include $(top_srcdir)/git.mk diff --git a/cut-n-paste/zoom-control/Makefile.am b/cut-n-paste/zoom-control/Makefile.am index 64cdc9d..af8bd48 100644 --- a/cut-n-paste/zoom-control/Makefile.am +++ b/cut-n-paste/zoom-control/Makefile.am @@ -12,3 +12,5 @@ libephyzoom_la_CFLAGS = \ $(SHELL_CORE_CFLAGS) \ $(WARNING_CFLAGS) \ $(DISABLE_DEPRECATED) + +-include $(top_srcdir)/git.mk diff --git a/data/Makefile.am b/data/Makefile.am index 5b129ce..a3c4e22 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -129,3 +129,5 @@ DISTCLEANFILES = \ $(DESKTOP_FILES) \ $(schema_DATA) \ $(service_DATA) + +-include $(top_srcdir)/git.mk diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am index 063f693..4497479 100644 --- a/data/icons/16x16/Makefile.am +++ b/data/icons/16x16/Makefile.am @@ -1 +1,3 @@ SUBDIRS = actions apps + +-include $(top_srcdir)/git.mk diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/16x16/actions/Makefile.am index 274f690..266a84a 100644 --- a/data/icons/16x16/actions/Makefile.am +++ b/data/icons/16x16/actions/Makefile.am @@ -21,3 +21,5 @@ noinst_DATA = \ EXTRA_DIST = \ $(icons_DATA) \ $(noinst_DATA) + +-include $(top_srcdir)/git.mk diff --git a/data/icons/16x16/apps/Makefile.am b/data/icons/16x16/apps/Makefile.am index 875cb2a..f23ab1a 100644 --- a/data/icons/16x16/apps/Makefile.am +++ b/data/icons/16x16/apps/Makefile.am @@ -12,3 +12,5 @@ noinst_DATA = EXTRA_DIST = \ $(icons_DATA) \ $(noinst_DATA) + +-include $(top_srcdir)/git.mk diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am index 063f693..4497479 100644 --- a/data/icons/22x22/Makefile.am +++ b/data/icons/22x22/Makefile.am @@ -1 +1,3 @@ SUBDIRS = actions apps + +-include $(top_srcdir)/git.mk diff --git a/data/icons/22x22/actions/Makefile.am b/data/icons/22x22/actions/Makefile.am index e50e35b..c1b56f6 100644 --- a/data/icons/22x22/actions/Makefile.am +++ b/data/icons/22x22/actions/Makefile.am @@ -22,3 +22,5 @@ noinst_DATA = \ EXTRA_DIST = \ $(icons_DATA) \ $(noinst_DATA) + +-include $(top_srcdir)/git.mk diff --git a/data/icons/22x22/apps/Makefile.am b/data/icons/22x22/apps/Makefile.am index 816fdd0..30c0396 100644 --- a/data/icons/22x22/apps/Makefile.am +++ b/data/icons/22x22/apps/Makefile.am @@ -12,3 +12,5 @@ noinst_DATA = EXTRA_DIST = \ $(icons_DATA) \ $(noinst_DATA) + +-include $(top_srcdir)/git.mk diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am index 063f693..4497479 100644 --- a/data/icons/24x24/Makefile.am +++ b/data/icons/24x24/Makefile.am @@ -1 +1,3 @@ SUBDIRS = actions apps + +-include $(top_srcdir)/git.mk diff --git a/data/icons/24x24/actions/Makefile.am b/data/icons/24x24/actions/Makefile.am index 492936f..1178aaa 100644 --- a/data/icons/24x24/actions/Makefile.am +++ b/data/icons/24x24/actions/Makefile.am @@ -16,3 +16,5 @@ noinst_DATA = EXTRA_DIST = \ $(icons_DATA) \ $(noinst_DATA) + +-include $(top_srcdir)/git.mk diff --git a/data/icons/24x24/apps/Makefile.am b/data/icons/24x24/apps/Makefile.am index 00b9a50..ff718d9 100644 --- a/data/icons/24x24/apps/Makefile.am +++ b/data/icons/24x24/apps/Makefile.am @@ -12,3 +12,5 @@ noinst_DATA = EXTRA_DIST = \ $(icons_DATA) \ $(noinst_DATA) + +-include $(top_srcdir)/git.mk diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am index 0224d45..6b7db23 100644 --- a/data/icons/32x32/Makefile.am +++ b/data/icons/32x32/Makefile.am @@ -1 +1,3 @@ SUBDIRS = actions + +-include $(top_srcdir)/git.mk diff --git a/data/icons/32x32/actions/Makefile.am b/data/icons/32x32/actions/Makefile.am index 6e74876..52a99cf 100644 --- a/data/icons/32x32/actions/Makefile.am +++ b/data/icons/32x32/actions/Makefile.am @@ -13,3 +13,5 @@ noinst_DATA = EXTRA_DIST = \ $(icons_DATA) \ $(noinst_DATA) + +-include $(top_srcdir)/git.mk diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am index ddce5ef..ae03308 100644 --- a/data/icons/48x48/Makefile.am +++ b/data/icons/48x48/Makefile.am @@ -1,2 +1,4 @@ SUBDIRS = actions apps + +-include $(top_srcdir)/git.mk diff --git a/data/icons/48x48/actions/Makefile.am b/data/icons/48x48/actions/Makefile.am index d995e5e..a8047ed 100644 --- a/data/icons/48x48/actions/Makefile.am +++ b/data/icons/48x48/actions/Makefile.am @@ -16,3 +16,5 @@ noinst_DATA = EXTRA_DIST = \ $(icons_DATA) \ $(noinst_DATA) + +-include $(top_srcdir)/git.mk diff --git a/data/icons/48x48/apps/Makefile.am b/data/icons/48x48/apps/Makefile.am index 32dbf13..8fb3b67 100644 --- a/data/icons/48x48/apps/Makefile.am +++ b/data/icons/48x48/apps/Makefile.am @@ -12,3 +12,5 @@ noinst_DATA = EXTRA_DIST = \ $(icons_DATA) \ $(noinst_DATA) + +-include $(top_srcdir)/git.mk diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index efd067d..6101c56 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -1,2 +1,4 @@ SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable + +-include $(top_srcdir)/git.mk diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am index ebbd145..906a50e 100644 --- a/data/icons/scalable/Makefile.am +++ b/data/icons/scalable/Makefile.am @@ -1 +1,3 @@ SUBDIRS = apps + +-include $(top_srcdir)/git.mk diff --git a/data/icons/scalable/apps/Makefile.am b/data/icons/scalable/apps/Makefile.am index af41994..8898fbb 100644 --- a/data/icons/scalable/apps/Makefile.am +++ b/data/icons/scalable/apps/Makefile.am @@ -12,3 +12,5 @@ noinst_DATA = EXTRA_DIST = \ $(icons_DATA) \ $(noinst_DATA) + +-include $(top_srcdir)/git.mk diff --git a/help/Makefile.am b/help/Makefile.am index d51479c..7c78e52 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -9,3 +9,5 @@ DOC_INCLUDES = DOC_FIGURES = figures/evince_start_window.png DOC_LINGUAS = bg ca cs de el en_GB es eu fi fr it ja nl oc pt_BR ru sr sv uk vi zh_CN + +-include $(top_srcdir)/git.mk diff --git a/help/reference/Makefile.am b/help/reference/Makefile.am index 6a042c8..1cbc430 100644 --- a/help/reference/Makefile.am +++ b/help/reference/Makefile.am @@ -1 +1,2 @@ -SUBDIRS = libdocument libview shell \ No newline at end of file +SUBDIRS = libdocument libview shell +-include $(top_srcdir)/git.mk diff --git a/help/reference/libdocument/Makefile.am b/help/reference/libdocument/Makefile.am index c5d3e6d..ad4bc35 100644 --- a/help/reference/libdocument/Makefile.am +++ b/help/reference/libdocument/Makefile.am @@ -98,3 +98,5 @@ include $(top_srcdir)/gtk-doc.make # Other files to distribute # e.g. EXTRA_DIST += version.xml.in EXTRA_DIST += version.xml.in + +-include $(top_srcdir)/git.mk diff --git a/help/reference/libview/Makefile.am b/help/reference/libview/Makefile.am index 232cde7..1f9f94d 100644 --- a/help/reference/libview/Makefile.am +++ b/help/reference/libview/Makefile.am @@ -104,3 +104,5 @@ include $(top_srcdir)/gtk-doc.make # Other files to distribute # e.g. EXTRA_DIST += version.xml.in EXTRA_DIST += version.xml.in + +-include $(top_srcdir)/git.mk diff --git a/help/reference/shell/Makefile.am b/help/reference/shell/Makefile.am index 00eb73b..36be01b 100644 --- a/help/reference/shell/Makefile.am +++ b/help/reference/shell/Makefile.am @@ -128,3 +128,5 @@ include $(top_srcdir)/gtk-doc.make # Other files to distribute # e.g. EXTRA_DIST += version.xml.in EXTRA_DIST += version.xml.in + +-include $(top_srcdir)/git.mk diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am index e4e28ee..22f9d3b 100644 --- a/libdocument/Makefile.am +++ b/libdocument/Makefile.am @@ -174,3 +174,5 @@ CLEANFILES += $(gir_DATA) $(typelibs_DATA) $< -o $@ endif # ENABLE_INTROSPECTION + +-include $(top_srcdir)/git.mk diff --git a/libmisc/Makefile.am b/libmisc/Makefile.am index 38a43fa..a6ec774 100644 --- a/libmisc/Makefile.am +++ b/libmisc/Makefile.am @@ -18,3 +18,5 @@ libevmisc_la_CFLAGS = \ libevmisc_la_LIBADD = \ $(top_builddir)/libdocument/libevdocument.la \ $(top_builddir)/libview/libevview.la + +-include $(top_srcdir)/git.mk diff --git a/libview/Makefile.am b/libview/Makefile.am index 1964eee..89cfa36 100644 --- a/libview/Makefile.am +++ b/libview/Makefile.am @@ -140,3 +140,5 @@ CLEANFILES += $(gir_DATA) $(typelibs_DATA) $< -o $@ endif # ENABLE_INTROSPECTION + +-include $(top_srcdir)/git.mk diff --git a/previewer/Makefile.am b/previewer/Makefile.am index 3744c62..ea5296e 100644 --- a/previewer/Makefile.am +++ b/previewer/Makefile.am @@ -34,3 +34,5 @@ evince_previewer_LDADD = \ $(top_builddir)/libmisc/libevmisc.la \ $(PREVIEWER_LIBS) + +-include $(top_srcdir)/git.mk diff --git a/properties/Makefile.am b/properties/Makefile.am index 0d2bf0e..67b7e7b 100644 --- a/properties/Makefile.am +++ b/properties/Makefile.am @@ -31,3 +31,5 @@ libevince_properties_page_la_LIBADD = \ libevince_properties_page_la_LDFLAGS = -module -avoid-version -no-undefined endif # ENABLE_NAUTILUS + +-include $(top_srcdir)/git.mk diff --git a/shell/Makefile.am b/shell/Makefile.am index 987d215..db878e6 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -166,3 +166,5 @@ ev-application-service.h: $(srcdir)/ev-application-service.xml ev-daemon-service.h: $(srcdir)/ev-daemon-service.xml $(AM_V_GEN)dbus-binding-tool --prefix=ev_daemon --mode=glib-server --output=ev-daemon-service.h $(srcdir)/ev-daemon-service.xml + +-include $(top_srcdir)/git.mk diff --git a/test/Makefile.am b/test/Makefile.am index 9cf215b..3f0a90c 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -15,3 +15,5 @@ EXTRA_DIST = \ test-page-labels.pdf \ test6.py \ test7.py + +-include $(top_srcdir)/git.mk diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am index 23bb4a3..45e3d2a 100644 --- a/thumbnailer/Makefile.am +++ b/thumbnailer/Makefile.am @@ -79,3 +79,5 @@ EXTRA_DIST = \ DISTCLEANFILES = \ $(schema_DATA) + +-include $(top_srcdir)/git.mk -- cgit v0.9.1