diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-06-15 05:37:32 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-06-15 05:37:32 +0000 |
| commit | f9ded8959a53275ae8e4ce5676419f090b0830de (patch) | |
| tree | 5a19e9cdd5fd2dea65fe21e94758267ea62a9645 | |
| parent | 17abd7136d8fb7f6b6a52f8158f899be9e41be5a (diff) | |
Fix shared libraries on OSX (STR #51)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3034 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | configure.in | 9 | ||||
| -rw-r--r-- | src/Makefile | 36 |
3 files changed, 30 insertions, 16 deletions
@@ -1,5 +1,6 @@ CHANGES IN FLTK 1.1.4 + - Fixed MacOS X shared library generation (STR #51) - Several widgets defined their own size() method but didn't provide an inline method that mapped to the Fl_Widget::size() method (STR #62) diff --git a/configure.in b/configure.in index 4735e2778..23c6a9c3d 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl -*- sh -*- dnl the "configure" script is made from this by running GNU "autoconf" dnl -dnl "$Id: configure.in,v 1.33.2.31.2.99 2003/05/29 19:43:06 easysw Exp $" +dnl "$Id: configure.in,v 1.33.2.31.2.100 2003/06/15 05:37:32 easysw Exp $" dnl dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl @@ -118,10 +118,7 @@ if test x$enable_shared = xyes; then FLDSONAME="libfltk_forms.$FL_API_VERSION.dylib" GLDSONAME="libfltk_gl.$FL_API_VERSION.dylib" IMGDSONAME="libfltk_images.$FL_API_VERSION.dylib" - DSOCOMMAND="ld $DSOFLAGS -dylib /usr/lib/dylib1.o -lc -o" - if test "x$libdir" != "x/usr/lib"; then - DSOLINK="-Wl,-rpath,$libdir" - fi + DSOCOMMAND="\$(CC) $DSOFLAGS -dynamiclib -lc -o" ;; SunOS* | UNIX_S*) @@ -848,5 +845,5 @@ dnl Make sure the fltk-config script is executable... chmod +x fltk-config dnl -dnl End of "$Id: configure.in,v 1.33.2.31.2.99 2003/05/29 19:43:06 easysw Exp $". +dnl End of "$Id: configure.in,v 1.33.2.31.2.100 2003/06/15 05:37:32 easysw Exp $". dnl diff --git a/src/Makefile b/src/Makefile index 696b48e13..51aed6f3f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.18.2.14.2.51 2003/06/05 21:14:19 easysw Exp $" +# "$Id: Makefile,v 1.18.2.14.2.52 2003/06/15 05:37:32 easysw Exp $" # # Library makefile for the Fast Light Tool Kit (FLTK). # @@ -200,19 +200,23 @@ $(LIBNAME): $(OBJECTS) libfltk.so.1.1: $(OBJECTS) echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(OBJECTS) $(IMAGELIBS) + $(DSOCOMMAND) $@ $(OBJECTS) -$(RM) libfltk.so $(LN) libfltk.so.1.1 libfltk.so libfltk.sl.1.1: $(OBJECTS) echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(OBJECTS) $(IMAGELIBS) + $(DSOCOMMAND) $@ $(OBJECTS) -$(RM) libfltk.sl $(LN) libfltk.sl.1.1 libfltk.sl libfltk.1.1.dylib: $(OBJECTS) echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) $(IMAGELIBS) + $(DSOCOMMAND) $@ \ + -install_name $(libdir)/$@ \ + -current_version 1.1.4 \ + -compatibility_version 1.1.0 \ + $(OBJECTS) $(LDLIBS) -$(RM) libfltk.dylib $(LN) libfltk.1.1.dylib libfltk.dylib @@ -244,7 +248,11 @@ libfltk_forms.sl.1.1: $(FLOBJECTS) libfltk_forms.1.1.dylib: $(FLOBJECTS) echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -Wl,-rpath,$(libdir) -L. -lfltk + $(DSOCOMMAND) $@ \ + -install_name $(libdir)/$@ \ + -current_version 1.1.4 \ + -compatibility_version 1.1.0 \ + $(FLOBJECTS) $(LDLIBS) -L. -lfltk -$(RM) libfltk_forms.dylib $(LN) libfltk_forms.1.1.dylib libfltk_forms.dylib @@ -276,7 +284,11 @@ libfltk_gl.sl.1.1: $(GLOBJECTS) libfltk_gl.1.1.dylib: $(GLOBJECTS) echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(GLOBJECTS) $(GLDLIBS) -Wl,-rpath,$(libdir) -L. -lfltk + $(DSOCOMMAND) $@ \ + -install_name $(libdir)/$@ \ + -current_version 1.1.4 \ + -compatibility_version 1.1.0 \ + $(GLOBJECTS) $(GLDLIBS) -L. -lfltk -$(RM) libfltk_gl.dylib $(LN) libfltk_gl.1.1.dylib libfltk_gl.dylib @@ -296,19 +308,23 @@ $(IMGLIBNAME): $(IMGOBJECTS) libfltk_images.so.1.1: $(IMGOBJECTS) echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(IMGOBJECTS) + $(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMGLIBS) -$(RM) libfltk_images.so $(LN) libfltk_images.so.1.1 libfltk_images.so libfltk_images.sl.1.1: $(IMGOBJECTS) echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(IMGOBJECTS) + $(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMGLIBS) -$(RM) libfltk_images.sl $(LN) libfltk_images.sl.1.1 libfltk_images.sl libfltk_images.1.1.dylib: $(IMGOBJECTS) echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(IMGOBJECTS) $(LDLIBS) $(IMAGELIBS) -Wl,-rpath,$(libdir) -L. -lfltk + $(DSOCOMMAND) $@ \ + -install_name $(libdir)/$@ \ + -current_version 1.1.4 \ + -compatibility_version 1.1.0 \ + $(IMGOBJECTS) $(LDLIBS) $(IMAGELIBS) -L. -lfltk -$(RM) libfltk_images.dylib $(LN) libfltk_images.1.1.dylib libfltk_images.dylib @@ -566,5 +582,5 @@ uninstall: # -# End of "$Id: Makefile,v 1.18.2.14.2.51 2003/06/05 21:14:19 easysw Exp $". +# End of "$Id: Makefile,v 1.18.2.14.2.52 2003/06/15 05:37:32 easysw Exp $". # |