X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=Makefile.am;h=6258442a5988dbc4d564126a4a8d1a3b574e7e3e;hb=e53e9652a52e468586df2ebdb03f51df781e9499;hp=3ee3aa93f99a70d80a2f005a8d21b144730c64e0;hpb=97cea9ca8cb6d4919d4039748d1a72fc1dea30a1;p=~andy%2Fgtk

diff --git a/Makefile.am b/Makefile.am
index 3ee3aa93f..6258442a5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,20 +10,17 @@ EXTRA_DIST =			\
 	HACKING			\
 	gtk+.spec.in		\
 	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		\
 	config.h.win32		\
-	po/README.tools		\
+	gtk-zip.sh		\
+	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  \
@@ -69,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  \
@@ -142,20 +137,20 @@ DISTCLEANFILES =				\
 	gtk+-$(GDKTARGET)-2.0-uninstalled.pc	\
 	gdk-$(GDKTARGET)-2.0-uninstalled.pc
 
-## symlink gdk-2.0.pc and gtk+-2.0.pc to default target for the platform 
+## copy the default target for this platform to gdk-2.0.pc and gtk+-2.0.pc
 DEFAULT_GDKTARGET=x11
-install-data-local:
+install-data-hook:
 	(cd $(DESTDIR)$(pkgconfigdir) && \
-	 test -e gdk-$(DEFAULT_GDKTARGET)-2.0.pc && \
-	 test -e gtk+-$(DEFAULT_GDKTARGET)-2.0.pc && \
-	 $(LN_S) -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc gdk-2.0.pc && \
-	 $(LN_S) -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc gtk+-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) && \
-	 $(LN_S) -f gdk-$(GDKTARGET)-2.0.pc gdk-2.0.pc && \
-	 $(LN_S) -f gtk+-$(GDKTARGET)-2.0.pc gtk+-2.0.pc)
+	 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 \
@@ -186,3 +181,28 @@ 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"