call g_test_init() from gtk_test_init().

[~andy/gtk] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 094efccedc07dcdba3af7e88e07b1c965de3a609..db7db5368ef8fc52a08d23e6654af817f880991d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
 ## Makefile.am for GTK+
+include $(top_srcdir)/Makefile.decl
 
 SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
@@ -6,7 +7,7 @@ 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            \
@@ -17,7 +18,10 @@ EXTRA_DIST =                 \
        ChangeLog.pre-2-4       \
        ChangeLog.pre-2-6       \
        ChangeLog.pre-2-8       \
-       README.cvs-commits      \
+       ChangeLog.pre-2-10      \
+       ChangeLog.gtk-async-file-chooser        \
+       ChangeLog.gtk-printing  \
+       README.commits  \
        README.win32            \
        config.h.win32          \
        makefile.msc    \
@@ -132,7 +136,11 @@ 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 gtk+-unix-print-2.0.pc
+pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc
+
+if OS_UNIX
+pkgconfig_DATA += gtk+-unix-print-2.0.pc
+endif
 
 DISTCLEANFILES =                               \
        gtk+-unix-print-2.0.pc                  \
@@ -189,5 +197,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