[PATCH] various Makefile.am cleanups

[Matt Wilson <msw gimp org>]

Most of these are minor except perhaps the gdk-pixbuf changes, so I
thought I'd send it here first.

Matt

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtk+/ChangeLog,v
retrieving revision 1.2288
diff -u -r1.2288 ChangeLog
--- ChangeLog	2001/09/17 02:19:00	1.2288
+++ ChangeLog	2001/09/17 16:14:56
@@ -1,3 +1,27 @@
+2001-09-17  Matt Wilson  <msw redhat com>
+
+	* docs/Makefile.am (EXTRA_DIST): don't use += before =
+
+	* docs/faq/Makefile.am (EXTRA_DIST): likewise
+
+	* docs/tutorial/Makefile.am (EXTRA_DIST): likewise
+	
+	* gdk/Makefile.am (MAINTAINERCLEANFILES): likewise
+	(EXTRA_HEADERS): likewise
+
+	* gtk/Makefile.am (MAINTAINERCLEANFILES): likewise
+	(EXTRA_HEADERS): likewise
+	(EXTRA_DIST): likewise
+	(CLEANFILES): likewise
+
+	* gtk/stock-icons/Makefile.am (CLEANFILES): likewise
+
+	* tests/Makefile.am (EXTRA_DIST): likewise
+	
+	* Makefile.am (install-data-local): changed to use
+	install-data-hook, which runs after install-pkgconfigDATA, so that
+	the pkgconfigdir will have been created and populated first.
+
 2001-09-16  Alexander Larsson  <alla lysator liu se>
 
 	* gtk/gtkoptionmenu.c:
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/Makefile.am,v
retrieving revision 1.52
diff -u -r1.52 Makefile.am
--- Makefile.am	2001/08/12 14:41:37	1.52
+++ Makefile.am	2001/09/17 16:14:56
@@ -144,7 +144,7 @@
 
 ## symlink gdk-2.0.pc and gtk+-2.0.pc to default target for the platform 
 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 && \
Index: docs/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/docs/Makefile.am,v
retrieving revision 1.21
diff -u -r1.21 Makefile.am
--- docs/Makefile.am	2001/09/04 16:06:56	1.21
+++ docs/Makefile.am	2001/09/17 16:14:57
@@ -2,7 +2,7 @@
 
 SUBDIRS = tutorial faq reference
 
-EXTRA_DIST += \
+EXTRA_DIST = \
 	Changes-1.2.txt			\
 	Changes-2.0.txt			\
 	debugging.txt			\
Index: docs/faq/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/docs/faq/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- docs/faq/Makefile.am	2000/11/18 01:49:46	1.2
+++ docs/faq/Makefile.am	2001/09/17 16:14:57
@@ -25,7 +25,7 @@
 	sgml2txt gtkfaq.sgml;                            \
 	mv gtkfaq.txt text/)
 
-EXTRA_DIST += gtkfaq.sgml gtk-faq.sgml
+EXTRA_DIST = gtkfaq.sgml gtk-faq.sgml
 
 if HAVE_SGML2HTML
 dist-hook: faq
Index: docs/tutorial/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/docs/tutorial/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- docs/tutorial/Makefile.am	2001/06/07 16:39:57	1.5
+++ docs/tutorial/Makefile.am	2001/09/17 16:14:57
@@ -123,7 +123,7 @@
 	mv gtk_tut_fr.txt text/)
 
 
-EXTRA_DIST += \
+EXTRA_DIST = \
 	gtk_tut.sgml			\
 	gtk_tut_12.es.sgml		\
 	gtk_tut_it.sgml			\
Index: gdk/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/Makefile.am,v
retrieving revision 1.69
diff -u -r1.69 Makefile.am
--- gdk/Makefile.am	2001/09/07 21:49:48	1.69
+++ gdk/Makefile.am	2001/09/17 16:14:57
@@ -142,10 +142,9 @@
 
 EXTRA_LTLIBRARIES = libgdk-x11-1.3.la libgdk-nanox-1.3.la libgdk-linux-fb-1.3.la
 
-MAINTAINERCLEANFILES +=
-EXTRA_HEADERS +=
-EXTRA_DIST +=
-EXTRA_DIST +=
+MAINTAINERCLEANFILES =
+EXTRA_HEADERS =
+EXTRA_DIST =
 
 #
 # rules to generate built sources
Index: gdk-pixbuf/ChangeLog
===================================================================
RCS file: /cvs/gnome/gtk+/gdk-pixbuf/ChangeLog,v
retrieving revision 1.329
diff -u -r1.329 ChangeLog
--- gdk-pixbuf/ChangeLog	2001/09/17 15:53:59	1.329
+++ gdk-pixbuf/ChangeLog	2001/09/17 16:14:57
@@ -1,3 +1,11 @@
+2001-09-17  Matt Wilson  <msw redhat com>
+
+	* Makefile.am (libpixbufloader_xbm_la_LDFLAGS): removed duplicate
+	LDFLAGS definition, use the -avoid-version one.
+	(libpixbufloader_tga_la_LDFLAGS): likewise
+	(libgdk_pixbuf_1_3_la_DEPENDENCIES): dependencies should be
+	autogenerated, should this be here?  Commented this out. 
+
 Mon Sep 17 11:49:02 2001  Owen Taylor  <otaylor redhat com>
 
 	* pixops/*: Mirror GdkInterpType to PixopsInterpType
Index: gdk-pixbuf/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gdk-pixbuf/Makefile.am,v
retrieving revision 1.104
diff -u -r1.104 Makefile.am
--- gdk-pixbuf/Makefile.am	2001/09/16 23:54:37	1.104
+++ gdk-pixbuf/Makefile.am	2001/09/17 16:14:57
@@ -91,7 +91,6 @@
 # The XBM loader
 #
 libpixbufloader_xbm_la_SOURCES = io-xbm.c
-libpixbufloader_xbm_la_LDFLAGS = -version-info 1:0:0 -module
 libpixbufloader_xbm_la_LDFLAGS = -avoid-version -module
 libpixbufloader_xbm_la_LIBADD = $(module_libs)
 
@@ -99,7 +98,6 @@
 # The TGA loader
 #
 libpixbufloader_tga_la_SOURCES = io-tga.c
-libpixbufloader_tga_la_LDFLAGS = -version-info 1:0:0 -module
 libpixbufloader_tga_la_LDFLAGS = -avoid-version -module
 libpixbufloader_tga_la_LIBADD = $(module_libs)
 
@@ -241,7 +239,7 @@
 @STRIP_END@
 
 libgdk_pixbuf_1_3_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS)
-libgdk_pixbuf_1_3_la_DEPENDENCIES = $(builtin_objs)
+#libgdk_pixbuf_1_3_la_DEPENDENCIES = $(builtin_objs)
 
 gdk_pixbuf_headers = \
 	gdk-pixbuf.h		\
Index: gtk/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/Makefile.am,v
retrieving revision 1.182
diff -u -r1.182 Makefile.am
--- gtk/Makefile.am	2001/09/11 20:24:39	1.182
+++ gtk/Makefile.am	2001/09/17 16:14:57
@@ -399,9 +399,9 @@
 #
 gtk_target_headers = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkversion.h
 gtk_target_sources = $(gtk_c_sources) $(gtk_plug_c_sources)
-MAINTAINERCLEANFILES += $(gtk_built_sources)
-EXTRA_HEADERS +=
-EXTRA_DIST += $(gtk_private_h_sources) $(gtk_extra_sources)
+MAINTAINERCLEANFILES = $(gtk_built_sources)
+EXTRA_HEADERS =
+EXTRA_DIST = $(gtk_private_h_sources) $(gtk_extra_sources)
 EXTRA_DIST += $(gtk_built_sources)
 
 #
@@ -409,7 +409,7 @@
 #
 # setup autogeneration dependancies
 gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc
-CLEANFILES += $(gen_sources)
+CLEANFILES = $(gen_sources)
 Makefile: oldest-source-stamp	# oh boy, does automake SUCK!
 oldest-source-stamp: $(gtk_built_sources)
 $(OBJECTS): oldest-source-stamp  ${gtk_built_public_sources} # this is our oldest file, used for implicit auto-generation deps
Index: gtk/stock-icons/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/stock-icons/Makefile.am,v
retrieving revision 1.11
diff -u -r1.11 Makefile.am
--- gtk/stock-icons/Makefile.am	2001/06/26 20:57:26	1.11
+++ gtk/stock-icons/Makefile.am	2001/09/17 16:14:57
@@ -150,7 +150,7 @@
 @STRIP_END@
 
 noinst_DATA = gtkstockpixbufs.h
-CLEANFILES += $(noinst_DATA)
+CLEANFILES = $(noinst_DATA)
 
 pixbuf_dir = $(top_builddir)/gdk-pixbuf
 
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/tests/Makefile.am,v
retrieving revision 1.16
diff -u -r1.16 Makefile.am
--- tests/Makefile.am	2001/08/26 22:23:28	1.16
+++ tests/Makefile.am	2001/09/17 16:14:57
@@ -95,7 +95,7 @@
 	testsocket_child.c	\
 	testsocket_common.c
 
-EXTRA_DIST += @STRIP_BEGIN@ 	\
+EXTRA_DIST = @STRIP_BEGIN@ 	\
 	prop-editor.h		\
 	testgtk.1 		\
 	testgtkrc 		\