callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When overriding LDFLAGS, include @LDFLAGS@, otherwise LDFLAGS the users

Browse Source 
Mon Aug  5 17:01:30 2002  Owen Taylor  <otaylor@redhat.com>

        * 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.
This commit is contained in:
Owen Taylor
2002-08-05 21:10:09 +00:00
committed by Owen Taylor
parent e8468d5e6d
commit e1826de7e7
9 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Mon Aug 5 17:01:30 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Mon Aug 5 15:25:40 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap): * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap):

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
Mon Aug 5 17:01:30 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Mon Aug 5 15:25:40 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap): * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap):

9
ChangeLog.pre-2-2
View File

@ -1,3 +1,12 @@
Mon Aug 5 17:01:30 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Mon Aug 5 15:25:40 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap): * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap):

9
ChangeLog.pre-2-4
View File

@ -1,3 +1,12 @@
Mon Aug 5 17:01:30 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Mon Aug 5 15:25:40 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap): * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap):

9
ChangeLog.pre-2-6
View File

@ -1,3 +1,12 @@
Mon Aug 5 17:01:30 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Mon Aug 5 15:25:40 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap): * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap):

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
Mon Aug 5 17:01:30 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Mon Aug 5 15:25:40 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap): * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap):

1
gdk/Makefile.am
View File

@ -69,6 +69,7 @@ endif
# since automake doesn't support conditionalized libsomething_la_LDFLAGS # since automake doesn't support conditionalized libsomething_la_LDFLAGS
# we use the general approach here # we use the general approach here
LDFLAGS = @STRIP_BEGIN@ \ LDFLAGS = @STRIP_BEGIN@ \
@LDFLAGS@ \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic \ -export-dynamic \
-rpath $(libdir) \ -rpath $(libdir) \

5
gdk/linux-fb/Makefile.am
View File

@ -19,11 +19,6 @@ INCLUDES = @STRIP_BEGIN@ \
@GTK_DEBUG_FLAGS@ \ @GTK_DEBUG_FLAGS@ \
@STRIP_END@ @STRIP_END@
LDFLAGS = @STRIP_BEGIN@ \
@GDK_DEP_LIBS@ \
-lm \
@STRIP_END@
noinst_LTLIBRARIES = libgdk-linux-fb.la noinst_LTLIBRARIES = libgdk-linux-fb.la
libgdkinclude_HEADERS= \ libgdkinclude_HEADERS= \

1
gtk/Makefile.am
View File

@ -65,6 +65,7 @@ endif
# we use the general approach here # we use the general approach here
libgtkincludedir = $(includedir)/gtk-2.0/gtk libgtkincludedir = $(includedir)/gtk-2.0/gtk
LDFLAGS = @STRIP_BEGIN@ \ LDFLAGS = @STRIP_BEGIN@ \
@LDFLAGS@ \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic \ -export-dynamic \
-rpath $(libdir) \ -rpath $(libdir) \