call g_test_init() from gtk_test_init().

[~andy/gtk] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 096e405dc9a684e32bbb1aa0a19e188bebc6cae6..db7db5368ef8fc52a08d23e6654af817f880991d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,28 +1,33 @@
 ## Makefile.am for GTK+
+include $(top_srcdir)/Makefile.decl
 
-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
-SUBDIRS = po $(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.4
+AUTOMAKE_OPTIONS = 1.7
 
-EXTRA_DIST =                   \
+EXTRA_DIST +=                  \
        HACKING                 \
-       gtk+.spec.in            \
        makecopyright           \
        NEWS.pre-1-0            \
        ChangeLog.pre-1-0       \
        ChangeLog.pre-1-2       \
-       README.cvs-commits      \
+       ChangeLog.pre-2-0       \
+       ChangeLog.pre-2-2       \
+       ChangeLog.pre-2-4       \
+       ChangeLog.pre-2-6       \
+       ChangeLog.pre-2-8       \
+       ChangeLog.pre-2-10      \
+       ChangeLog.gtk-async-file-chooser        \
+       ChangeLog.gtk-printing  \
+       README.commits  \
        README.win32            \
        config.h.win32          \
-       gtk-zip.sh              \
+       makefile.msc    \
+       gtk-zip.sh.in           \
        sanitize-la.sh          \
-       po/README.tools         \
        po/README.translators   \
-       po/desk.pl              \
-       po/makefile.mingw       \
-       po/update.pl            \
        po/po2tbl.sed.in        \
        examples/aspectframe/Makefile  \
        examples/aspectframe/aspectframe.c  \
@@ -133,7 +138,12 @@ gdk-$(GDKTARGET)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc
 pkgconfigdir = $(libdir)/pkgconfig
 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                  \
        gtk+-$(GDKTARGET)-2.0.pc                \
        gdk-$(GDKTARGET)-2.0.pc                 \
        gtk+-$(GDKTARGET)-2.0-uninstalled.pc    \
@@ -151,14 +161,17 @@ install-data-hook:
         rm -f gdk-2.0.pc && cp -f gdk-$(GDKTARGET)-2.0.pc gdk-2.0.pc && \
         rm -f gtk+-2.0.pc && cp -f gtk+-$(GDKTARGET)-2.0.pc gtk+-2.0.pc)
 
-dist-hook: gtk+.spec
+uninstall-local:
+       rm -f $(DESTDIR)$(pkgconfigdir)/gdk-2.0.pc
+       rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-2.0.pc
+
+dist-hook:
        if test -f $(srcdir)/INSTALL.in && test -f $(srcdir)/README.in ; then \
             CONFIG_FILES="INSTALL:$(srcdir)/INSTALL.in README:$(srcdir)/README.in" \
             CONFIG_HEADERS= \
             $(SHELL) config.status \
             && cp INSTALL README $(distdir) ; \
-       fi \
-       && cp gtk+.spec $(distdir)
+       fi
 
 .PHONY: files release sanity snapshot
 
@@ -184,27 +197,4 @@ sanity:
 snapshot:
        $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
 
-
-# This is a version of the automake-1.4 distcheck rule modified
-# to pass --enable-gtk-doc to ./configure
-#
-mydistcheck: dist
-       -rm -rf $(distdir)
-       GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-       mkdir $(distdir)/=build
-       mkdir $(distdir)/=inst
-       dc_install_base=`cd $(distdir)/=inst && pwd`; \
-       cd $(distdir)/=build \
-         && ../configure --srcdir=.. --prefix=$$dc_install_base --enable-gtk-doc \
-         && $(MAKE) $(AM_MAKEFLAGS) \
-         && $(MAKE) $(AM_MAKEFLAGS) dvi \
-         && $(MAKE) $(AM_MAKEFLAGS) check \
-         && $(MAKE) $(AM_MAKEFLAGS) install \
-         && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-         && $(MAKE) $(AM_MAKEFLAGS) dist
-       -rm -rf $(distdir)
-       @banner="$(distdir).tar.gz is ready for distribution"; \
-       dashes=`echo "$$banner" | sed s/./=/g`; \
-       echo "$$dashes"; \
-       echo "$$banner"; \
-       echo "$$dashes"
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-rebuilds