X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=Makefile.am;h=cad44f6eda68c8b348d9fe87318470865b41bd68;hb=b522b823bd8967c138af552b529b216a56754edf;hp=812c5b0f83ee2274089993678a840d4fc5575213;hpb=5ac61d3eeebe1947c4a3c5fbab3a89bb4d124a59;p=~andy%2Fgtk

diff --git a/Makefile.am b/Makefile.am
index 812c5b0f8..cad44f6ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,28 +1,27 @@
 ## Makefile.am for GTK+
 
-SRC_SUBDIRS = gdk-pixbuf gdk modules gtk demos
-SUBDIRS = po $(SRC_SUBDIRS) docs build
-
-bin_SCRIPTS = gtk-config-2.0
+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
+SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros
 
 # require automake 1.4
-AUTOMAKE_OPTIONS = 1.4
+AUTOMAKE_OPTIONS = 1.7
 
 EXTRA_DIST =			\
 	HACKING			\
-	gtk+.spec.in		\
-        gtk-2.0.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		\
+	makefile.msc	\
+	gtk-zip.sh.in		\
+	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,17 +109,57 @@ EXTRA_DIST =			\
 	examples/spinbutton/Makefile  \
 	examples/find-examples.sh
 
-dist-hook: gtk+.spec
-	if test -e $(srcdir)/INSTALL.in && test -e $(srcdir)/README.in ; then \
+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)
+
+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)
-
-m4datadir = $(datadir)/aclocal
-m4data_DATA = gtk-2.0.m4
+	fi
 
 .PHONY: files release sanity snapshot
 
@@ -146,4 +183,7 @@ sanity:
 
 
 snapshot:
-	$(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`
+	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+
+
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc