diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-03-25 15:26:44 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-03-25 15:26:44 +0000 |
| commit | a5778a1864570ae097099363377f2b3b05c17737 (patch) | |
| tree | 2249c6b82038146a4b6a76ab0e92a7d314daa199 /src/Makefile | |
| parent | 7b19ba41ae282ff46eed9f7bc8804aadd55da3dd (diff) | |
Updated README and distribution packages to use v1.0.1.
Updated makefiles and makeincludes to use DSONAME and GLDLIBS.
Updated configure.in to use DSONAME instead of LIBNAME.
Updated editor example code in documentation.
Added ANSI C++ changes to make things compile with the latest EGCS
compiler.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@458 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/src/Makefile b/src/Makefile index 2f0a99a71..9d0f12626 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.18 1999/03/09 18:33:46 mike Exp $" +# "$Id: Makefile,v 1.18.2.1 1999/03/25 15:26:43 mike Exp $" # # Library makefile for the Fast Light Tool Kit (FLTK). # @@ -150,16 +150,16 @@ LIBRARY = ../lib/$(LIBNAME) OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o) -all: $(LIBRARY) ../lib/libfltk.a +all: $(LIBRARY) $(DSONAME) ../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) +libfltk.sl.1 libfltk.so.1: $(OBJECTS) + @echo $(DSOCOMMAND) $(DSONAME) ... + @$(DSOCOMMAND) $(DSONAME) $(OBJECTS) .SUFFIXES: .cxx .h .o @@ -178,29 +178,35 @@ include makedepend ################################################################ -install: ../lib/$(LIBNAME) - -mkdir -p $(libdir) - -cp ../lib/$(LIBNAME)* $(libdir) - -cp ../lib/libfltk.a $(libdir) - if test $(LIBNAME) = libfltk.so.1; then\ - rm -f $(libdir)/libfltk.so;\ +install: ../lib/$(LIBNAME) $(DSONAME) + @echo "Installing libraries..." + @-mkdir -p $(libdir) + @rm -f $(libdir)/$(LIBNAME) + @-cp ../lib/$(LIBNAME) $(libdir) + @-chmod 644 $(libdir)/$(LIBNAME) + @if test "$(DSONAME)" = libfltk.so.1; then\ + rm -f $(libdir)/libfltk.so*;\ + cp libfltk.so $(libdir)/libfltk.so.1; \ + chmod 755 $(libdir)/libfltk.so.1; \ ln -s $(libdir)/libfltk.so.1 $(libdir)/libfltk.so;\ fi - if test $(LIBNAME) = libfltk.sl.1; then\ - rm -f $(libdir)/libfltk.sl;\ + @if test "$(DSONAME)" = libfltk.sl.1; then\ + rm -f $(libdir)/libfltk.sl*;\ + cp libfltk.sl $(libdir)/libfltk.sl.1; \ + chmod 755 $(libdir)/libfltk.sl.1; \ ln -s $(libdir)/libfltk.sl.1 $(libdir)/libfltk.sl;\ fi - @-chmod a+r,u+w,g-w,o-w $(libdir)/$(LIBNAME)* - -mkdir -p $(includedir) - -rm -rf $(includedir)/FL $(includedir)/Fl - -cp -r ../FL $(includedir) - @-chmod -R a+r,u+w,g-w,o-w $(includedir)/FL - for file in $(includedir)/FL/*.H; do\ + @echo "Installing include files..." + @-mkdir -p $(includedir) + @rm -rf $(includedir)/FL $(includedir)/Fl + @-cp -r ../FL $(includedir) + @-chmod -R 644 $(includedir)/FL + @for file in $(includedir)/FL/*.H; do\ newfile="`basename $$file H`h";\ ln -s $$file $(includedir)/FL/$$newfile;\ done - -ln -s FL $(includedir)/Fl + @-ln -s FL $(includedir)/Fl # -# End of "$Id: Makefile,v 1.18 1999/03/09 18:33:46 mike Exp $". +# End of "$Id: Makefile,v 1.18.2.1 1999/03/25 15:26:43 mike Exp $". # |