diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-07-14 17:03:31 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-07-14 17:03:31 +0000 |
| commit | 3346a9fee75faff9b8087513204cb63cfcf8ec0c (patch) | |
| tree | 9d047b2a883c283ebca058e3872758aa8c39a69c /fluid | |
| parent | 8e2ff295008e2319e01df604a7c8e382924b22cd (diff) | |
Change the Fl_Group current, add, and remove methods so they are no longer
inline; this should make shared libraries work better on all platforms.
Link FLUID against shared libraries, too, so that the installed fluid is
also using shared libraries (still make a statically linked fluid for the
build)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2525 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/Makefile | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/fluid/Makefile b/fluid/Makefile index 201043471..b9fc446b9 100644 --- a/fluid/Makefile +++ b/fluid/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.10.2.6.2.20 2002/06/28 21:04:36 easysw Exp $" +# "$Id: Makefile,v 1.10.2.6.2.21 2002/07/14 17:03:31 easysw Exp $" # # FLUID makefile for the Fast Light Tool Kit (FLTK). # @@ -23,8 +23,6 @@ # Please report all bugs and problems to "fltk-bugs@fltk.org". # -PROGRAM = fluid$(EXEEXT) - CPPFILES = \ Fl_Function_Type.cxx \ Fl_Menu_Type.cxx \ @@ -47,18 +45,26 @@ CPPFILES = \ OBJECTS = $(CPPFILES:.cxx=.o) -CLEAN = core +CLEAN = core* include ../makeinclude -$(PROGRAM) : $(OBJECTS) ../lib/$(LIBNAME) +all: $(FLUID) fluid$(EXEEXT) + +fluid$(EXEEXT): $(OBJECTS) ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) \ + ../lib/$(IMGLIBNAME) + echo Linking $@... + $(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) -lfltk_images $(IMAGELIBS) $(LDLIBS) + $(POSTBUILD) $@ ../FL/mac.r + +fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \ + ../src/$(IMGDSONAME) echo Linking $@... - $(CXX) $(CXXFLAGS) -o $(PROGRAM) $(OBJECTS) $(LINKFLTKFORMS) \ - -lfltk_images $(IMAGELIBS) $(LDLIBS) + $(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS) $(POSTBUILD) $@ ../FL/mac.r clean : - -@ rm -f *.o $(PROGRAM) $(CLEAN) + -@ $(RM) *.o fluid$(EXEEXT) fluid-shared$(EXEEXT) $(CLEAN) depend: $(CPPFILES) makedepend -Y -I.. -f makedepend $(CPPFILES) @@ -68,14 +74,14 @@ include makedepend install: $(PROGRAM) echo "Installing FLUID in $(bindir)..." - -mkdir -p $(bindir) - cp $(PROGRAM) $(bindir) - strip $(bindir)/$(PROGRAM) - $(bindir)/fltk-config --post $(bindir)/$(PROGRAM) - chmod 755 $(bindir)/$(PROGRAM) + -$(MKDIR) $(bindir) + $(CP) $(FLUID) $(bindir)/fluid + $(STRIP) $(bindir)/fluid + $(bindir)/fltk-config --post $(bindir)/fluid + $(CHMOD) 755 $(bindir)/fluid uninstall: - rm -f $(bindir)/$(PROGRAM) + $(RM) $(bindir)/fluid # # Note: The rebuild target can only be used if you have the original .fl @@ -89,5 +95,5 @@ rebuild: ./fluid -c widget_panel.fl # -# End of "$Id: Makefile,v 1.10.2.6.2.20 2002/06/28 21:04:36 easysw Exp $". +# End of "$Id: Makefile,v 1.10.2.6.2.21 2002/07/14 17:03:31 easysw Exp $". # |