From cdde1ea3d4295396c37b5b8123923c6b55c144ec Mon Sep 17 00:00:00 2001 From: fayjf Date: Wed, 28 Sep 2011 01:04:17 +0000 Subject: [PATCH] Addressing Ubuntu bug 686315 reported as freeglut bug 3407093 -- rearranging the 'Makefile.am' loader flags git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@939 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/progs/demos/CallbackMaker/Makefile.am | 3 ++- freeglut/freeglut/progs/demos/Fractals/Makefile.am | 3 ++- freeglut/freeglut/progs/demos/Fractals_random/Makefile.am | 4 ++-- freeglut/freeglut/progs/demos/Lorenz/Makefile.am | 4 ++-- freeglut/freeglut/progs/demos/One/Makefile.am | 3 ++- freeglut/freeglut/progs/demos/shapes/Makefile.am | 3 ++- freeglut/freeglut/progs/demos/smooth_opengl3/Makefile.am | 3 ++- freeglut/freeglut/progs/demos/spaceball/Makefile.am | 6 +++--- freeglut/freeglut/progs/demos/subwin/Makefile.am | 3 ++- 9 files changed, 19 insertions(+), 13 deletions(-) diff --git a/freeglut/freeglut/progs/demos/CallbackMaker/Makefile.am b/freeglut/freeglut/progs/demos/CallbackMaker/Makefile.am index c70c398..18b0699 100644 --- a/freeglut/freeglut/progs/demos/CallbackMaker/Makefile.am +++ b/freeglut/freeglut/progs/demos/CallbackMaker/Makefile.am @@ -1,5 +1,6 @@ EXTRA_DIST = CallbackMaker.c CallbackMaker.dsp noinst_PROGRAMS = CallbackMaker CallbackMaker_SOURCES = CallbackMaker.c -CallbackMaker_LDFLAGS = -export-dynamic ../../../src/lib@LIBRARY@.la +CallbackMaker_LDFLAGS = -export-dynamic +CallbackMaker_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS) CallbackMaker_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS) diff --git a/freeglut/freeglut/progs/demos/Fractals/Makefile.am b/freeglut/freeglut/progs/demos/Fractals/Makefile.am index 8be8276..2eef2f3 100644 --- a/freeglut/freeglut/progs/demos/Fractals/Makefile.am +++ b/freeglut/freeglut/progs/demos/Fractals/Makefile.am @@ -1,5 +1,6 @@ EXTRA_DIST = Fractals.dsp fractals.c fractals.dat noinst_PROGRAMS = fractals fractals_SOURCES = fractals.c -fractals_LDFLAGS = -export-dynamic ../../../src/lib@LIBRARY@.la +fractals_LDFLAGS = -export-dynamic +fractals_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS) fractals_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS) diff --git a/freeglut/freeglut/progs/demos/Fractals_random/Makefile.am b/freeglut/freeglut/progs/demos/Fractals_random/Makefile.am index 9dc66b9..b881c23 100644 --- a/freeglut/freeglut/progs/demos/Fractals_random/Makefile.am +++ b/freeglut/freeglut/progs/demos/Fractals_random/Makefile.am @@ -1,6 +1,6 @@ EXTRA_DIST = Fractals_random.dsp fractals.dat fractals_random.c - noinst_PROGRAMS = fractals_random fractals_random_SOURCES = fractals_random.c -fractals_random_LDFLAGS = -export-dynamic ../../../src/lib@LIBRARY@.la +fractals_random_LDFLAGS = -export-dynamic +fractals_random_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS) fractals_random_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS) diff --git a/freeglut/freeglut/progs/demos/Lorenz/Makefile.am b/freeglut/freeglut/progs/demos/Lorenz/Makefile.am index 0d61044..9180fc3 100644 --- a/freeglut/freeglut/progs/demos/Lorenz/Makefile.am +++ b/freeglut/freeglut/progs/demos/Lorenz/Makefile.am @@ -1,6 +1,6 @@ EXTRA_DIST = lorenz.c lorenz.dsp - noinst_PROGRAMS = lorenz lorenz_SOURCES = lorenz.c -lorenz_LDFLAGS = -export-dynamic ../../../src/lib@LIBRARY@.la +lorenz_LDFLAGS = -export-dynamic +lorenz_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS) lorenz_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS) diff --git a/freeglut/freeglut/progs/demos/One/Makefile.am b/freeglut/freeglut/progs/demos/One/Makefile.am index 7f5906c..d51617d 100644 --- a/freeglut/freeglut/progs/demos/One/Makefile.am +++ b/freeglut/freeglut/progs/demos/One/Makefile.am @@ -1,5 +1,6 @@ EXTRA_DIST = one.c one.dsp noinst_PROGRAMS = one one_SOURCES = one.c -one_LDFLAGS = -export-dynamic ../../../src/lib@LIBRARY@.la +one_LDFLAGS = -export-dynamic +one_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS) one_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS) diff --git a/freeglut/freeglut/progs/demos/shapes/Makefile.am b/freeglut/freeglut/progs/demos/shapes/Makefile.am index f44415c..3560e36 100644 --- a/freeglut/freeglut/progs/demos/shapes/Makefile.am +++ b/freeglut/freeglut/progs/demos/shapes/Makefile.am @@ -1,5 +1,6 @@ EXTRA_DIST = shapes.c shapes.dsp noinst_PROGRAMS = shapes shapes_SOURCES = shapes.c -shapes_LDFLAGS = -export-dynamic ../../../src/lib@LIBRARY@.la +shapes_LDFLAGS = -export-dynamic +shapes_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS) shapes_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS) diff --git a/freeglut/freeglut/progs/demos/smooth_opengl3/Makefile.am b/freeglut/freeglut/progs/demos/smooth_opengl3/Makefile.am index 493b742..fcc85d7 100644 --- a/freeglut/freeglut/progs/demos/smooth_opengl3/Makefile.am +++ b/freeglut/freeglut/progs/demos/smooth_opengl3/Makefile.am @@ -1,5 +1,6 @@ EXTRA_DIST = smooth_opengl3.c smooth_opengl3.dsp noinst_PROGRAMS = smooth_opengl3 smooth_opengl3_SOURCES = smooth_opengl3.c -smooth_opengl3_LDFLAGS = -export-dynamic ../../../src/lib@LIBRARY@.la +smooth_opengl3_LDFLAGS = -export-dynamic +smooth_opengl3_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS) smooth_opengl3_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS) diff --git a/freeglut/freeglut/progs/demos/spaceball/Makefile.am b/freeglut/freeglut/progs/demos/spaceball/Makefile.am index 10b628c..e2a3ab4 100644 --- a/freeglut/freeglut/progs/demos/spaceball/Makefile.am +++ b/freeglut/freeglut/progs/demos/spaceball/Makefile.am @@ -1,6 +1,6 @@ EXTRA_DIST = spaceball.c vmath.c vmath.h vmath.inl - noinst_PROGRAMS = spaceball spaceball_SOURCES = spaceball.c vmath.c -spaceball_LDFLAGS = -export-dynamic ../../../src/lib@LIBRARY@.la -spaceball_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS) \ No newline at end of file +spaceball_LDFLAGS = -export-dynamic +spaceball_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS) +spaceball_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS) diff --git a/freeglut/freeglut/progs/demos/subwin/Makefile.am b/freeglut/freeglut/progs/demos/subwin/Makefile.am index c5372a2..03b1e7b 100644 --- a/freeglut/freeglut/progs/demos/subwin/Makefile.am +++ b/freeglut/freeglut/progs/demos/subwin/Makefile.am @@ -1,5 +1,6 @@ EXTRA_DIST = subwin.c subwin.dsp noinst_PROGRAMS = subwin subwin_SOURCES = subwin.c -subwin_LDFLAGS = -export-dynamic ../../../src/lib@LIBRARY@.la +subwin_LDFLAGS = -export-dynamic +subwin_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS) subwin_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS)