don't use += before =

2001-09-18 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. gdk-pixbuf/ChangeLog 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
2001-09-18 13:26:52 +00:00
parent a251679148
commit cbae279486
17 changed files with 187 additions and 16 deletions
--- a/24
+++ b/24
@@ -1,3 +1,27 @@
+2001-09-18  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.
+
 Mon Sep 17 17:39:52 2001  Jonathan Blandford  <jrb@redhat.com>

 	* gtk/gtkcelleditable.[ch]: Add editable interface.  This should
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,27 @@
+2001-09-18  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.
+
 Mon Sep 17 17:39:52 2001  Jonathan Blandford  <jrb@redhat.com>

 	* gtk/gtkcelleditable.[ch]: Add editable interface.  This should
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,27 @@
+2001-09-18  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.
+
 Mon Sep 17 17:39:52 2001  Jonathan Blandford  <jrb@redhat.com>

 	* gtk/gtkcelleditable.[ch]: Add editable interface.  This should
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,27 @@
+2001-09-18  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.
+
 Mon Sep 17 17:39:52 2001  Jonathan Blandford  <jrb@redhat.com>

 	* gtk/gtkcelleditable.[ch]: Add editable interface.  This should
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,27 @@
+2001-09-18  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.
+
 Mon Sep 17 17:39:52 2001  Jonathan Blandford  <jrb@redhat.com>

 	* gtk/gtkcelleditable.[ch]: Add editable interface.  This should
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,27 @@
+2001-09-18  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.
+
 Mon Sep 17 17:39:52 2001  Jonathan Blandford  <jrb@redhat.com>

 	* gtk/gtkcelleditable.[ch]: Add editable interface.  This should
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,27 @@
+2001-09-18  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.
+
 Mon Sep 17 17:39:52 2001  Jonathan Blandford  <jrb@redhat.com>

 	* gtk/gtkcelleditable.[ch]: Add editable interface.  This should
--- a/Makefile.am
+++ b/Makefile.am
@@ -144,7 +144,7 @@ DISTCLEANFILES =				\

 ## 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 && \
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -2,7 +2,7 @@

 SUBDIRS = tutorial faq reference

-EXTRA_DIST += \
+EXTRA_DIST = \
 	Changes-1.2.txt			\
 	Changes-2.0.txt			\
 	debugging.txt			\
--- a/docs/faq/Makefile.am
+++ b/docs/faq/Makefile.am
@@ -25,7 +25,7 @@ faq: htmldir textdir
 	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
--- a/docs/tutorial/Makefile.am
+++ b/docs/tutorial/Makefile.am
@@ -123,7 +123,7 @@ tutorial_fr: htmldir textdir
 	mv gtk_tut_fr.txt text/)


-EXTRA_DIST += \
+EXTRA_DIST = \
 	gtk_tut.sgml			\
 	gtk_tut_12.es.sgml		\
 	gtk_tut_it.sgml			\
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,9 @@
+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
+
 Mon Sep 17 11:49:02 2001  Owen Taylor  <otaylor@redhat.com>

 	* pixops/*: Mirror GdkInterpType to PixopsInterpType
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -91,7 +91,6 @@ libpixbufloader_wbmp_la_LIBADD = $(module_libs)
 # 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 @@ libpixbufloader_xbm_la_LIBADD = $(module_libs)
 # 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)

--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -142,10 +142,9 @@ lib_LTLIBRARIES = $(extra)

 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
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -401,9 +401,9 @@ gtk_extra_sources = @STRIP_BEGIN@ \
 #
 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)

 #
@@ -411,7 +411,7 @@ EXTRA_DIST += $(gtk_built_sources)
 #
 # 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
--- a/gtk/stock-icons/Makefile.am
+++ b/gtk/stock-icons/Makefile.am
@@ -150,7 +150,7 @@ VARIABLES = @STRIP_BEGIN@ 									\
@STRIP_END@

 noinst_DATA = gtkstockpixbufs.h
-CLEANFILES += $(noinst_DATA)
+CLEANFILES = $(noinst_DATA)

 pixbuf_dir = $(top_builddir)/gdk-pixbuf

--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -95,7 +95,7 @@ testsocket_child_SOURCES =    	\
 	testsocket_child.c	\
 	testsocket_common.c

-EXTRA_DIST += @STRIP_BEGIN@ 	\
+EXTRA_DIST = @STRIP_BEGIN@ 	\
 	prop-editor.h		\
 	testgtk.1 		\
 	testgtkrc 		\