(committed this again -- broken pipe and ChangeLog update)

[~andy/gtk] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 42577a920564b249cd7e77b9d28d5423d98fdb56..564984596914b718e12374c9daa6669c1457436f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,7 @@
 ## Makefile.am for GTK+
 
-SRC_SUBDIRS = gdk-pixbuf gdk modules gtk demos contrib
-SUBDIRS = po $(SRC_SUBDIRS) docs build
-
-bin_SCRIPTS = gtk-config-2.0
+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,7 +9,6 @@ AUTOMAKE_OPTIONS = 1.4
 EXTRA_DIST =                   \
        HACKING                 \
        gtk+.spec.in            \
-        gtk-2.0.m4             \
        makecopyright           \
        TODO                    \
        TODO.xml                \
@@ -21,8 +18,14 @@ EXTRA_DIST =                 \
        README.cvs-commits      \
        README.win32            \
        README.nanox            \
-       intl/libgettext.h       \
-       intl/po2tbl.sed.in      \
+       config.h.win32          \
+       gtk-zip.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  \
        examples/Makefile  \
@@ -112,8 +115,45 @@ 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-2.0.pc gtk+-2.0.pc
+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 -e gdk-$(DEFAULT_GDKTARGET)-2.0.pc && \
+        test -e 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 \
@@ -124,9 +164,6 @@ dist-hook: gtk+.spec
        fi \
        && cp gtk+.spec $(distdir)
 
-m4datadir = $(datadir)/aclocal
-m4data_DATA = gtk-2.0.m4
-
 .PHONY: files release sanity snapshot
 
 files: