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 /src/Makefile | |
| 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
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
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 |