diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-03-09 18:32:44 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-03-09 18:32:44 +0000 |
| commit | 022e5d90f1e3a6b429f522941729438f5452ee02 (patch) | |
| tree | 8b9f7c286fe5b7e393771e72cc9dac5d45224765 /src/Makefile | |
| parent | 8a0c2ce3731f8b4bf63204c0801a41defc4a7ee4 (diff) | |
Updated Linux DSO rules.
Changed configure.in, makeinclude, and src/Makefile to use DSOCOMMAND
instead of replacing LIBCOMMAND.
src/Makefile now creates both static and shared libraries if
--enable-shared is requested.
fluid/Makefile always uses the static library so that a CVS build will
always work, even if libfltk.so.1 isn't installed (problem for Solaris
and Linux, which don't support LD_LIBRARY_PATH).
git-svn-id: file:///fltk/svn/fltk/trunk@387 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/Makefile b/src/Makefile index b110fdd0f..05d76777d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.16 1999/03/04 14:54:18 mike Exp $" +# "$Id: Makefile,v 1.17 1999/03/09 18:32:44 mike Exp $" # # Library makefile for the Fast Light Tool Kit (FLTK). # @@ -150,10 +150,16 @@ LIBRARY = ../lib/$(LIBNAME) OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o) -$(LIBRARY) : $(OBJECTS) - @echo $(LIBCOMMAND) $(LIBRARY) ... - @$(LIBCOMMAND) $(LIBRARY) $(OBJECTS) - @$(RANLIB) $(LIBRARY) +all: $(LIBRARY) ../lib/libfltk.a + +../lib/libfltk.a: $(OBJECTS) + @echo $(LIBCOMMAND) ../lib/libfltk.a ... + @$(LIBCOMMAND) ../lib/libfltk.a $(OBJECTS) + @$(RANLIB) ../lib/libfltk.a + +../lib/libfltk.sl.1 ../lib/libfltk.so.1: $(OBJECTS) + @echo $(DSOCOMMAND) $(LIBRARY) ... + @$(DSOCOMMAND) $(LIBRARY) $(OBJECTS) .SUFFIXES: .cxx .h .o @@ -195,5 +201,5 @@ install: ../lib/$(LIBNAME) -ln -s FL $(includedir)/Fl # -# End of "$Id: Makefile,v 1.16 1999/03/04 14:54:18 mike Exp $". +# End of "$Id: Makefile,v 1.17 1999/03/09 18:32:44 mike Exp $". # |