Release 2.16.1

[~andy/gtk] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index aec8aa875965f95502da6198dc5b9f23b7682120..7264d564c1de0e273be2ebd7eabadede5030c5c3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,13 @@
 ## Makefile.am for GTK+
+include $(top_srcdir)/Makefile.decl
 
-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
-SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros
+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
+SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
 
 # require automake 1.4
 AUTOMAKE_OPTIONS = 1.7
 
-EXTRA_DIST =                   \
+EXTRA_DIST +=                  \
        HACKING                 \
        makecopyright           \
        NEWS.pre-1-0            \
@@ -16,7 +17,14 @@ EXTRA_DIST =                 \
        ChangeLog.pre-2-2       \
        ChangeLog.pre-2-4       \
        ChangeLog.pre-2-6       \
-       README.cvs-commits      \
+       ChangeLog.pre-2-8       \
+       ChangeLog.pre-2-10      \
+       ChangeLog.pre-2-12      \
+       ChangeLog.pre-2-14      \
+       ChangeLog.pre-2-16      \
+       ChangeLog.gtk-async-file-chooser        \
+       ChangeLog.gtk-printing  \
+       README.commits  \
        README.win32            \
        config.h.win32          \
        makefile.msc    \
@@ -131,13 +139,40 @@ gdk-$(GDKTARGET)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc
        cp gdk-2.0-uninstalled.pc gdk-$(GDKTARGET)-2.0-uninstalled.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc
+pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc gail.pc
+
+if OS_UNIX
+pkgconfig_DATA += gtk+-unix-print-2.0.pc
+endif
 
 DISTCLEANFILES =                               \
+       gtk+-unix-print-2.0.pc                  \
        gtk+-$(GDKTARGET)-2.0.pc                \
        gdk-$(GDKTARGET)-2.0.pc                 \
+       gail.pc                                 \
        gtk+-$(GDKTARGET)-2.0-uninstalled.pc    \
-       gdk-$(GDKTARGET)-2.0-uninstalled.pc
+       gdk-$(GDKTARGET)-2.0-uninstalled.pc     \
+       gail-uninstalled.pc                     \
+       config.lt
+
+distclean-local:
+       if test $(srdcir) = .; then :; else \
+               rm -f ChangeLog; \
+       fi
+
+ChangeLog:
+       @echo Creating $@
+       @if test -d "$(srcdir)/.git"; then \
+         (GIT_DIR=$(top_srcdir)/.git ./missing --run git log GTK_2_16_0^^.. --stat) | fmt --split-only > $@.tmp \
+         && mv -f $@.tmp $@ \
+         || ($(RM) $@.tmp; \
+             echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
+             (test -f $@ || echo git-log is required to generate this file >> $@)); \
+       else \
+         test -f $@ || \
+         (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
+         echo A git checkout and git-log is required to generate this file >> $@); \
+       fi
 
 ## copy the default target for this platform to gdk-2.0.pc and gtk+-2.0.pc
 DEFAULT_GDKTARGET=x11
@@ -163,7 +198,7 @@ dist-hook:
             && cp INSTALL README $(distdir) ; \
        fi
 
-.PHONY: files release sanity snapshot
+.PHONY: files release sanity snapshot ChangeLog
 
 files:
        @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
@@ -187,5 +222,4 @@ sanity:
 snapshot:
        $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
 
-
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-rebuilds