diff --git a/ChangeLog b/ChangeLog index 81e5074a01..45a9ba17d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2001-12-01 Daniel Egger + + * app/core/Makefile.am + * libgimp/Makefile.am + * libgimpbase/Makefile.am + * libgimpcolor/Makefile.am + * libgimpmath/Makefile.am + * libgimpwidgets/Makefile.am + * modules/Makefile.am + * themes/Default/Makefile.am: Don't try to concatenate something + to a variable not used before but simply assign it. Shuts up + annoying automake warnings for me. + 2001-12-01 Abel Cheung * tips/{Makefile.am,makefile.mingw}: Added gimp_tips.zh_TW.txt diff --git a/app/core/Makefile.am b/app/core/Makefile.am index 2d2dd8a17c..0dde15c276 100644 --- a/app/core/Makefile.am +++ b/app/core/Makefile.am @@ -167,7 +167,7 @@ EXTRA_DIST = \ # # setup autogeneration dependancies gen_sources = xgen-gmh xgen-gmc -CLEANFILES += $(gen_sources) +CLEANFILES = $(gen_sources) $(srcdir)/stamp-gimpmarshal.h: $(srcdir)/gimpmarshal.list gimpmarshal.h glib-genmarshal --prefix=gimp_marshal $(srcdir)/gimpmarshal.list --header >> xgen-gmh \ diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am index 6a7f42201d..e86eb2d0d4 100644 --- a/libgimp/Makefile.am +++ b/libgimp/Makefile.am @@ -169,7 +169,7 @@ gimpinclude_HEADERS = @STRIP_BEGIN@ \ gimpmenu.h \ @STRIP_END@ -EXTRA_HEADERS += +EXTRA_HEADERS = libgimp_1_3_la_LDFLAGS = @STRIP_BEGIN@ \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ diff --git a/libgimpbase/Makefile.am b/libgimpbase/Makefile.am index f1ea805698..78d8bee83c 100644 --- a/libgimpbase/Makefile.am +++ b/libgimpbase/Makefile.am @@ -62,7 +62,7 @@ libgimpbaseinclude_HEADERS = @STRIP_BEGIN@ \ gimpversion.h \ @STRIP_END@ -EXTRA_HEADERS += +EXTRA_HEADERS = libgimpbase_1_3_la_LDFLAGS = @STRIP_BEGIN@ \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ diff --git a/libgimpcolor/Makefile.am b/libgimpcolor/Makefile.am index 3b95df0142..c3f0ba08f3 100644 --- a/libgimpcolor/Makefile.am +++ b/libgimpcolor/Makefile.am @@ -49,7 +49,7 @@ libgimpcolorinclude_HEADERS = @STRIP_BEGIN@ \ gimprgb.h \ @STRIP_END@ -EXTRA_HEADERS += +EXTRA_HEADERS = libgimpcolor_1_3_la_LDFLAGS = @STRIP_BEGIN@ \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ diff --git a/libgimpmath/Makefile.am b/libgimpmath/Makefile.am index 535825e957..b5a4325bc1 100644 --- a/libgimpmath/Makefile.am +++ b/libgimpmath/Makefile.am @@ -40,7 +40,7 @@ libgimpmathinclude_HEADERS = @STRIP_BEGIN@ \ gimpvector.h \ @STRIP_END@ -EXTRA_HEADERS += +EXTRA_HEADERS = libgimpmath_1_3_la_LDFLAGS = @STRIP_BEGIN@ \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am index 8717182d8a..668ac6814f 100644 --- a/libgimpwidgets/Makefile.am +++ b/libgimpwidgets/Makefile.am @@ -77,7 +77,7 @@ libgimpwidgetsinclude_HEADERS = @STRIP_BEGIN@ \ gimpunitmenu.h \ @STRIP_END@ -EXTRA_HEADERS += +EXTRA_HEADERS = libgimpwidgets_1_3_la_LDFLAGS = @STRIP_BEGIN@ \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ diff --git a/modules/Makefile.am b/modules/Makefile.am index 8d9774044c..fa6cd0edf8 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -28,7 +28,7 @@ libexec_LTLIBRARIES = @STRIP_BEGIN@ \ ## libcolorsel_gtk.la \ ## libcolorsel_water.la \ -EXTRA_LTLIBRARIES += +EXTRA_LTLIBRARIES = ## libcolorsel_gtk_la_SOURCES = colorsel_gtk.c ## libcolorsel_gtk_la_LDFLAGS = -avoid-version -module diff --git a/themes/Default/Makefile.am b/themes/Default/Makefile.am index 945a23c162..6429073f50 100644 --- a/themes/Default/Makefile.am +++ b/themes/Default/Makefile.am @@ -149,7 +149,7 @@ WILBER_VARIABLES = @STRIP_BEGIN@ \ @STRIP_END@ noinst_DATA = gimp-stock-pixbufs.h gimp-wilber-pixbufs.h -CLEANFILES += $(noinst_DATA) +CLEANFILES = $(noinst_DATA) gimp-stock-pixbufs.h: $(STOCK_IMAGES) $(STOCK_TOOL_IMAGES) gdk-pixbuf-csource --raw --build-list $(STOCK_VARIABLES) $(STOCK_TOOL_VARIABLES) >$(srcdir)/gimp-stock-pixbufs.h