From cbae279486cd8d098be6ad9023fac6ed10fab20e Mon Sep 17 00:00:00 2001 From: Matt Wilson Date: Tue, 18 Sep 2001 13:26:52 +0000 Subject: [PATCH] don't use += before = 2001-09-18 Matt Wilson * 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 * Makefile.am (libpixbufloader_xbm_la_LDFLAGS): removed duplicate LDFLAGS definition, use the -avoid-version one. (libpixbufloader_tga_la_LDFLAGS): likewise --- ChangeLog | 24 ++++++++++++++++++++++++ ChangeLog.pre-2-0 | 24 ++++++++++++++++++++++++ ChangeLog.pre-2-10 | 24 ++++++++++++++++++++++++ ChangeLog.pre-2-2 | 24 ++++++++++++++++++++++++ ChangeLog.pre-2-4 | 24 ++++++++++++++++++++++++ ChangeLog.pre-2-6 | 24 ++++++++++++++++++++++++ ChangeLog.pre-2-8 | 24 ++++++++++++++++++++++++ Makefile.am | 2 +- docs/Makefile.am | 2 +- docs/faq/Makefile.am | 2 +- docs/tutorial/Makefile.am | 2 +- gdk-pixbuf/ChangeLog | 6 ++++++ gdk-pixbuf/Makefile.am | 2 -- gdk/Makefile.am | 7 +++---- gtk/Makefile.am | 8 ++++---- gtk/stock-icons/Makefile.am | 2 +- tests/Makefile.am | 2 +- 17 files changed, 187 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index d704d0b30..6914fef55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +2001-09-18 Matt Wilson + + * 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 * gtk/gtkcelleditable.[ch]: Add editable interface. This should diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index d704d0b30..6914fef55 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,27 @@ +2001-09-18 Matt Wilson + + * 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 * gtk/gtkcelleditable.[ch]: Add editable interface. This should diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d704d0b30..6914fef55 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,27 @@ +2001-09-18 Matt Wilson + + * 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 * gtk/gtkcelleditable.[ch]: Add editable interface. This should diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index d704d0b30..6914fef55 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,27 @@ +2001-09-18 Matt Wilson + + * 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 * gtk/gtkcelleditable.[ch]: Add editable interface. This should diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d704d0b30..6914fef55 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,27 @@ +2001-09-18 Matt Wilson + + * 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 * gtk/gtkcelleditable.[ch]: Add editable interface. This should diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d704d0b30..6914fef55 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,27 @@ +2001-09-18 Matt Wilson + + * 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 * gtk/gtkcelleditable.[ch]: Add editable interface. This should diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d704d0b30..6914fef55 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,27 @@ +2001-09-18 Matt Wilson + + * 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 * gtk/gtkcelleditable.[ch]: Add editable interface. This should diff --git a/Makefile.am b/Makefile.am index 3ee3aa93f..adbb7c912 100644 --- 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 && \ diff --git a/docs/Makefile.am b/docs/Makefile.am index a47b01a1a..6e053b641 100644 --- 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 \ diff --git a/docs/faq/Makefile.am b/docs/faq/Makefile.am index 977b6f820..1a8b4e622 100644 --- 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 diff --git a/docs/tutorial/Makefile.am b/docs/tutorial/Makefile.am index 25e2c7ffd..94826e5ef 100644 --- 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 \ diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 97e138870..1f1df403e 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,9 @@ +2001-09-17 Matt Wilson + + * 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 * pixops/*: Mirror GdkInterpType to PixopsInterpType diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index fad339547..8707a1b03 100644 --- 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) diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 095019f4d..c61af55ba 100644 --- 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 diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 77c92c453..831acc91f 100644 --- 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 diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am index 3ea1084ce..a91f9a322 100644 --- 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 diff --git a/tests/Makefile.am b/tests/Makefile.am index 2041f0b89..ddb04fb83 100644 --- 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 \ -- 2.43.2