From b8dcdf4c648a36182aff048a618463087de41c7c Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 8 Aug 2005 00:44:38 +0000 Subject: 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 --- makeinclude.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'makeinclude.in') 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@ -- cgit v1.2.3