Skip to content

Commit

Permalink
Newer linkers are more strict about libs coming after objects.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
clbr committed Aug 21, 2014
1 parent 376cad5 commit c4b6455
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/Makefile
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down

0 comments on commit c4b6455

Please sign in to comment.