X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=Makefile.am;h=8e4c951de043da65a78d872d82d3c53c81ab1d72;hb=7d72a3edb9d72b0ed155ad5293eb47a745688790;hp=d126a78dd60ba3b7d72d9ca8357fe8334f198932;hpb=a3b1cd22c444987759dc2af47828b5644879c5cc;p=~andy%2Fgtk

diff --git a/Makefile.am b/Makefile.am
index d126a78dd..8e4c951de 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,30 +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		\
-	TODO			\
-	TODO.xml		\
 	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		\
-	README.nanox		\
 	config.h.win32		\
-	gtk-zip.sh		\
-	po/README.tools		\
+	makefile.msc	\
+	gtk-zip.sh.in		\
+	sanitize-la.sh		\
 	po/README.translators	\
-	po/desk.pl		\
-	po/makefile.mingw	\
-	po/update.pl		\
 	po/po2tbl.sed.in	\
 	examples/aspectframe/Makefile  \
 	examples/aspectframe/aspectframe.c  \
@@ -133,34 +136,44 @@ 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
+pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc gail.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			\
+	gail.pc					\
 	gtk+-$(GDKTARGET)-2.0-uninstalled.pc	\
-	gdk-$(GDKTARGET)-2.0-uninstalled.pc
+	gdk-$(GDKTARGET)-2.0-uninstalled.pc	\
+	gail-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 && \
+	 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 \
+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
 
@@ -185,3 +198,5 @@ sanity:
 
 snapshot:
 	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-rebuilds