summaryrefslogtreecommitdiff
path: root/fluid/Makefile
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2008-12-29 19:45:46 +0000
committerMatthias Melcher <fltk@matthiasm.com>2008-12-29 19:45:46 +0000
commit6b3f61e3ffab1e3770a819aceecb06decf13f9da (patch)
tree36720c0b169a6049bbc3ed80aefa85affa3074b1 /fluid/Makefile
parent7180c24f3c32491971f984196607ff65a345a914 (diff)
In the configuration setp, LIBNAME (which contains the local path of the library as seen from the src directory) was used wrong. I added LIBBASENAME, the true library name without the path, and replaced LIBNAME wherever it was used wrongly.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6611 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid/Makefile')
-rw-r--r--fluid/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/fluid/Makefile b/fluid/Makefile
index eff686ec1..c59044ccd 100644
--- a/fluid/Makefile
+++ b/fluid/Makefile
@@ -54,8 +54,8 @@ include ../makeinclude
all: $(FLUID) fluid$(EXEEXT)
-fluid$(EXEEXT): $(OBJECTS) ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) \
- ../lib/$(IMGLIBNAME)
+fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
+ $(IMGLIBNAME)
echo Linking $@...
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
$(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS