From 682c55451c8549bd48e7ed6128d2f7e5c1ba98f6 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Tue, 26 Feb 2008 21:20:48 +0000 Subject: [PATCH] don't assume that global AM_LDFLAGS and per-target LD_FLAGS would sum up 2008-02-26 Sven Neumann * app/Makefile.am (gimp_2_5_LDFLAGS): don't assume that global AM_LDFLAGS and per-target LD_FLAGS would sum up and explicitly add AM_LDFLAGS to gimp_2_5_LDFLAGS. svn path=/trunk/; revision=24987 --- ChangeLog | 6 ++++++ app/Makefile.am | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6f149d2c73..dc464e6381 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-02-26 Sven Neumann + + * app/Makefile.am (gimp_2_5_LDFLAGS): don't assume that global + AM_LDFLAGS and per-target LD_FLAGS would sum up and explicitly add + AM_LDFLAGS to gimp_2_5_LDFLAGS. + 2008-02-26 Sven Neumann * plug-ins/print/print.h (struct PrintData): removed unused field. diff --git a/app/Makefile.am b/app/Makefile.am index 6715bd3555..9664128ba3 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -97,7 +97,7 @@ AM_LDFLAGS = $(munix) \ -u $(SYMPREFIX)gimp_coords_mix \ -u $(SYMPREFIX)gimp_plug_in_manager_restore -gimp_2_5_LDFLAGS = $(mwindows) +gimp_2_5_LDFLAGS = $(AM_LDFLAGS) $(mwindows) gimp_2_5_LDADD = \ gui/libappgui.a \