summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLauri Kasanen <cand@gmx.com>2014-08-21 14:24:19 +0000
committerLauri Kasanen <cand@gmx.com>2014-08-21 14:24:19 +0000
commitc4b6455d3202590a01d8d84a4863447a9b04a1e8 (patch)
tree4cc176f05433d354dbcc9fe26aca85af624e67be
parent376cad54b166870abd3ffa601c8364abbc3eecb0 (diff)
Newer linkers are more strict about libs coming after objects.
This is also consistent with the Mac and Windows platforms in the same file. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10241 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--src/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile
index f9f0cf8c7..625e067a7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -235,7 +235,7 @@ $(LIBNAME): $(OBJECTS)
libfltk.so.1.3: $(OBJECTS)
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(OBJECTS)
+ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
$(RM) libfltk.so
$(LN) libfltk.so.1.3 libfltk.so
@@ -271,7 +271,7 @@ $(FLLIBNAME): $(FLOBJECTS)
libfltk_forms.so.1.3: $(FLOBJECTS) libfltk.so.1.3
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
+ $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(LDLIBS)
$(RM) libfltk_forms.so
$(LN) libfltk_forms.so.1.3 libfltk_forms.so
@@ -307,7 +307,7 @@ $(GLLIBNAME): $(GLOBJECTS)
libfltk_gl.so.1.3: $(GLOBJECTS) libfltk.so.1.3
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
+ $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(LDLIBS) $(GLDLIBS)
$(RM) libfltk_gl.so
$(LN) libfltk_gl.so.1.3 libfltk_gl.so
@@ -343,7 +343,7 @@ $(IMGLIBNAME): $(IMGOBJECTS)
libfltk_images.so.1.3: $(IMGOBJECTS) libfltk.so.1.3
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
+ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(LDLIBS)
$(RM) libfltk_images.so
$(LN) libfltk_images.so.1.3 libfltk_images.so