From e1826de7e7fd5cb23c20ffeefb8bb195c6606111 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 5 Aug 2002 21:10:09 +0000 Subject: [PATCH] When overriding LDFLAGS, include @LDFLAGS@, otherwise LDFLAGS the users Mon Aug 5 17:01:30 2002 Owen Taylor * gdk/Makefile.am (LDFLAGS): When overriding LDFLAGS, include @LDFLAGS@, otherwise LDFLAGS the users passes to configure don't get used. (#89946, Noah Levitt, Albert Chin) * gdk/linux-fb/Makefile.am: Remove LDFLAGS setting. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gdk/Makefile.am | 1 + gdk/linux-fb/Makefile.am | 5 ----- gtk/Makefile.am | 1 + 9 files changed, 56 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a1605dd3b..720e6ba9f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Mon Aug 5 17:01:30 2002 Owen Taylor + + * gdk/Makefile.am (LDFLAGS): When overriding LDFLAGS, + include @LDFLAGS@, otherwise LDFLAGS the users passes + to configure don't get used. (#89946, Noah Levitt, + Albert Chin) + + * gdk/linux-fb/Makefile.am: Remove LDFLAGS setting. + Mon Aug 5 15:25:40 2002 Owen Taylor * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6a1605dd3b..720e6ba9f2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Mon Aug 5 17:01:30 2002 Owen Taylor + + * gdk/Makefile.am (LDFLAGS): When overriding LDFLAGS, + include @LDFLAGS@, otherwise LDFLAGS the users passes + to configure don't get used. (#89946, Noah Levitt, + Albert Chin) + + * gdk/linux-fb/Makefile.am: Remove LDFLAGS setting. + Mon Aug 5 15:25:40 2002 Owen Taylor * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 6a1605dd3b..720e6ba9f2 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Mon Aug 5 17:01:30 2002 Owen Taylor + + * gdk/Makefile.am (LDFLAGS): When overriding LDFLAGS, + include @LDFLAGS@, otherwise LDFLAGS the users passes + to configure don't get used. (#89946, Noah Levitt, + Albert Chin) + + * gdk/linux-fb/Makefile.am: Remove LDFLAGS setting. + Mon Aug 5 15:25:40 2002 Owen Taylor * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6a1605dd3b..720e6ba9f2 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Mon Aug 5 17:01:30 2002 Owen Taylor + + * gdk/Makefile.am (LDFLAGS): When overriding LDFLAGS, + include @LDFLAGS@, otherwise LDFLAGS the users passes + to configure don't get used. (#89946, Noah Levitt, + Albert Chin) + + * gdk/linux-fb/Makefile.am: Remove LDFLAGS setting. + Mon Aug 5 15:25:40 2002 Owen Taylor * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6a1605dd3b..720e6ba9f2 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Mon Aug 5 17:01:30 2002 Owen Taylor + + * gdk/Makefile.am (LDFLAGS): When overriding LDFLAGS, + include @LDFLAGS@, otherwise LDFLAGS the users passes + to configure don't get used. (#89946, Noah Levitt, + Albert Chin) + + * gdk/linux-fb/Makefile.am: Remove LDFLAGS setting. + Mon Aug 5 15:25:40 2002 Owen Taylor * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6a1605dd3b..720e6ba9f2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Mon Aug 5 17:01:30 2002 Owen Taylor + + * gdk/Makefile.am (LDFLAGS): When overriding LDFLAGS, + include @LDFLAGS@, otherwise LDFLAGS the users passes + to configure don't get used. (#89946, Noah Levitt, + Albert Chin) + + * gdk/linux-fb/Makefile.am: Remove LDFLAGS setting. + Mon Aug 5 15:25:40 2002 Owen Taylor * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap): diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 62ae6275bd..1d4181f5ac 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -69,6 +69,7 @@ endif # since automake doesn't support conditionalized libsomething_la_LDFLAGS # we use the general approach here LDFLAGS = @STRIP_BEGIN@ \ + @LDFLAGS@ \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -export-dynamic \ -rpath $(libdir) \ diff --git a/gdk/linux-fb/Makefile.am b/gdk/linux-fb/Makefile.am index 4e0f37eb23..56d9f3134a 100644 --- a/gdk/linux-fb/Makefile.am +++ b/gdk/linux-fb/Makefile.am @@ -19,11 +19,6 @@ INCLUDES = @STRIP_BEGIN@ \ @GTK_DEBUG_FLAGS@ \ @STRIP_END@ -LDFLAGS = @STRIP_BEGIN@ \ - @GDK_DEP_LIBS@ \ - -lm \ -@STRIP_END@ - noinst_LTLIBRARIES = libgdk-linux-fb.la libgdkinclude_HEADERS= \ diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 10a0800891..3d4f25af0c 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -65,6 +65,7 @@ endif # we use the general approach here libgtkincludedir = $(includedir)/gtk-2.0/gtk LDFLAGS = @STRIP_BEGIN@ \ + @LDFLAGS@ \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -export-dynamic \ -rpath $(libdir) \