diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-08-08 00:44:38 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-08-08 00:44:38 +0000 |
| commit | b8dcdf4c648a36182aff048a618463087de41c7c (patch) | |
| tree | d4e58833eb10fe55b20226f840744e10ae8d4a25 | |
| parent | 7da5a27b404078ecefcb90f2374e2e2e09ad9e47 (diff) | |
Compilation could fail if a previous installation of FLTK was in
the same (non-standard) directory as an image library (STR #926)
configure.in:
- Add LINKFLTKFORMS definition.
- Change LINKFLTK* definitions to just reference the static
libraries themselves.
makeinclude.in:
- Use LINKFLTKFORMS and drop -L../lib stuff for static linking.
src/Makefile:
- Move -L. in front of LDLIBS and IMGLIBS when linking shared
libfltk_images.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4472 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | makeinclude.in | 8 | ||||
| -rw-r--r-- | src/Makefile | 6 |
4 files changed, 16 insertions, 11 deletions
@@ -2,6 +2,9 @@ CHANGES IN FLTK 1.1.7 - Documentation fixes (STR #648, STR #692, STR #730, STR #744, STR #745, STR #942, STR #931) + - Compilation could fail if a previous installation of + FLTK was in the same (non-standard) directory as an + image library (STR #926) - Fixed OSX compilation problems with non-HFS filesystems (STR #972) - Problems with CMake on MinGW have been solved, thanks diff --git a/configure.in b/configure.in index e1a6cf4e5..c601e7ad1 100644 --- a/configure.in +++ b/configure.in @@ -80,9 +80,10 @@ case $uname in esac dnl Define the libraries and link options we'll need. -LINKFLTK="-lfltk" -LINKFLTKGL="-lfltk_gl" -LINKFLTKIMG="-lfltk_images" +LINKFLTK="../lib/libfltk.a" +LINKFLTKFORMS="../lib/libfltk_forms.a" +LINKFLTKGL="../lib/libfltk_gl.a" +LINKFLTKIMG="../lib/libfltk_images.a" GLDEMOS="gldemos" LIBEXT=".a" @@ -98,6 +99,7 @@ AC_SUBST(IMGLIBNAME) AC_SUBST(LIBEXT) AC_SUBST(LIBNAME) AC_SUBST(LINKFLTK) +AC_SUBST(LINKFLTKFORMS) AC_SUBST(LINKFLTKGL) AC_SUBST(LINKFLTKIMG) @@ -208,7 +210,7 @@ else PICFLAG=0 SHAREDSUFFIX="" FLUID="fluid" - LINKSHARED="-L../lib -lfltk_images -lfltk_forms -lfltk" + LINKSHARED="../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a" fi AC_SUBST(DSOCOMMAND) diff --git a/makeinclude.in b/makeinclude.in index 1517436a0..08d1e5bf2 100644 --- a/makeinclude.in +++ b/makeinclude.in @@ -75,10 +75,10 @@ DSOCOMMAND = @DSOCOMMAND@ # libraries to link with: LDLIBS = @LDFLAGS@ @LIBS@ GLDLIBS = @LDFLAGS@ @GLLIB@ @LIBS@ -LINKFLTK = -L../lib @LINKFLTK@ -LINKFLTKGL = -L../lib @LINKFLTKGL@ -LINKFLTKFORMS = -L../lib -lfltk_forms @LINKFLTK@ -LINKFLTKIMG = -L../lib -lfltk_images @LINKFLTK@ $(IMAGELIBS) +LINKFLTK = @LINKFLTK@ +LINKFLTKGL = @LINKFLTKGL@ +LINKFLTKFORMS = @LINKFLTKFORMS@ @LINKFLTK@ +LINKFLTKIMG = @LINKFLTKIMG@ @LINKFLTK@ $(IMAGELIBS) LINKSHARED = @DSOLINK@ @LINKSHARED@ $(IMAGELIBS) IMAGELIBS = @IMAGELIBS@ diff --git a/src/Makefile b/src/Makefile index a89d54f56..eb768b798 100644 --- a/src/Makefile +++ b/src/Makefile @@ -310,13 +310,13 @@ $(IMGLIBNAME): $(IMGOBJECTS) libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1 echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk + $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(RM) libfltk_images.so $(LN) libfltk_images.so.1.1 libfltk_images.so libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1 echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk + $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(RM) libfltk_images.sl $(LN) libfltk_images.sl.1.1 libfltk_images.sl @@ -326,7 +326,7 @@ libfltk_images.1.1.dylib: $(IMGOBJECTS) libfltk.1.1.dylib -install_name $(libdir)/$@ \ -current_version 1.1.4 \ -compatibility_version 1.1.0 \ - $(IMGOBJECTS) $(LDLIBS) -L. $(IMAGELIBS) -lfltk + $(IMGOBJECTS) -L.$(LDLIBS) $(IMAGELIBS) -lfltk $(RM) libfltk_images.dylib $(LN) libfltk_images.1.1.dylib libfltk_images.dylib |