Pass TRUE for search_sensitive - prevents a problem where after hitting

[~andy/gtk] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 24c865adcd2a81ce6ea250aa5462a7770dd87473..6258442a5988dbc4d564126a4a8d1a3b574e7e3e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,7 @@
 ## Makefile.am for GTK+
 
-SRC_SUBDIRS = gdk-pixbuf gdk modules gtk demos
-SUBDIRS = po $(SRC_SUBDIRS) docs
-
-bin_SCRIPTS = gtk-config
+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
+SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros
 
 # require automake 1.4
 AUTOMAKE_OPTIONS = 1.4
@@ -11,18 +9,19 @@ AUTOMAKE_OPTIONS = 1.4
 EXTRA_DIST =                   \
        HACKING                 \
        gtk+.spec.in            \
-        gtk.m4                 \
        makecopyright           \
-       TODO                    \
-       TODO.xml                \
        NEWS.pre-1-0            \
        ChangeLog.pre-1-0       \
        ChangeLog.pre-1-2       \
+       ChangeLog.pre-2-0       \
        README.cvs-commits      \
        README.win32            \
-       README.nanox            \
-       intl/libgettext.h       \
-       intl/po2tbl.sed.in      \
+       config.h.win32          \
+       gtk-zip.sh              \
+       sanitize-la.sh          \
+       po/README.translators   \
+       po/makefile.mingw       \
+       po/po2tbl.sed.in        \
        examples/aspectframe/Makefile  \
        examples/aspectframe/aspectframe.c  \
        examples/Makefile  \
@@ -67,8 +66,6 @@ EXTRA_DIST =                  \
        examples/notebook/notebook.c  \
        examples/packbox/Makefile  \
        examples/packbox/packbox.c  \
-       examples/packer/Makefile  \
-       examples/packer/pack.c  \
        examples/paned/Makefile  \
        examples/paned/paned.c  \
        examples/pixmap/Makefile  \
@@ -112,8 +109,48 @@ EXTRA_DIST =                       \
        examples/spinbutton/Makefile  \
        examples/find-examples.sh
 
+GDKTARGET=@gdktarget@
+
+## Copy .pc files to target-specific names
+gtk+-$(GDKTARGET)-2.0.pc: gtk+-2.0.pc
+       rm -f gtk+-$(GDKTARGET)-2.0.pc && \
+       cp gtk+-2.0.pc gtk+-$(GDKTARGET)-2.0.pc
+
+gdk-$(GDKTARGET)-2.0.pc: gdk-2.0.pc
+       rm -f gdk-$(GDKTARGET)-2.0.pc && \
+       cp gdk-2.0.pc gdk-$(GDKTARGET)-2.0.pc
+
+gtk+-$(GDKTARGET)-2.0-uninstalled.pc: gtk+-2.0-uninstalled.pc
+       rm -f gtk+-$(GDKTARGET)-2.0-uninstalled.pc && \
+       cp gtk+-2.0-uninstalled.pc gtk+-$(GDKTARGET)-2.0-uninstalled.pc
+
+gdk-$(GDKTARGET)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc
+       rm -f gdk-$(GDKTARGET)-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
+
+DISTCLEANFILES =                               \
+       gtk+-$(GDKTARGET)-2.0.pc                \
+       gdk-$(GDKTARGET)-2.0.pc                 \
+       gtk+-$(GDKTARGET)-2.0-uninstalled.pc    \
+       gdk-$(GDKTARGET)-2.0-uninstalled.pc
+
+## copy the default target for this platform to gdk-2.0.pc and gtk+-2.0.pc
+DEFAULT_GDKTARGET=x11
+install-data-hook:
+       (cd $(DESTDIR)$(pkgconfigdir) && \
+        test -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc && \
+        test -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc && \
+        rm -f gdk-2.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc gdk-2.0.pc && \
+        rm -f gtk+-2.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc gtk+-2.0.pc) || \
+       (cd $(DESTDIR)$(pkgconfigdir) && \
+        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
-       if test -e $(srcdir)/INSTALL.in && test -e $(srcdir)/README.in ; then \
+       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 \
@@ -121,9 +158,6 @@ dist-hook: gtk+.spec
        fi \
        && cp gtk+.spec $(distdir)
 
-m4datadir = $(datadir)/aclocal
-m4data_DATA = gtk.m4
-
 .PHONY: files release sanity snapshot
 
 files:
@@ -146,4 +180,29 @@ sanity:
 
 
 snapshot:
-       $(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`
+       $(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"