From ddf259f2bb48006fc0ebe9630644fd768c9192bd Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sat, 29 Sep 2001 15:57:32 +0000 Subject: New fltk-config script for 1.1. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1614 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Makefile | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/Makefile b/src/Makefile index 1f3982d48..a80060fa0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.18.2.14.2.10 2001/09/29 14:38:59 easysw Exp $" +# "$Id: Makefile,v 1.18.2.14.2.11 2001/09/29 15:57:32 easysw Exp $" # # Library makefile for the Fast Light Tool Kit (FLTK). # @@ -189,16 +189,16 @@ $(GLLIBNAME): $(GLOBJECTS) $(LIBCOMMAND) $@ $(GLOBJECTS) $(RANLIB) $@ -libfltkgl.so.1.1 libfltkgl.sl.1.1: $(GLOBJECTS) +libfltk_gl.so.1.1 libfltk_gl.sl.1.1: $(GLOBJECTS) echo $(DSOCOMMAND) $@ ... $(DSOCOMMAND) $@ $(GLOBJECTS) -libfltkgl_s.a: $(GLOBJECTS) - echo $(DSOCOMMAND) libfltkgl_s.o ... - $(DSOCOMMAND) libfltkgl_s.o $(GLOBJECTS) - echo $(LIBCOMMAND) libfltkgl_s.a libfltkgl_s.o - $(LIBCOMMAND) libfltkgl_s.a libfltkgl_s.o - chmod +x libfltkgl_s.a +libfltk_gl_s.a: $(GLOBJECTS) + echo $(DSOCOMMAND) libfltk_gl_s.o ... + $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) + echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o + $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o + chmod +x libfltk_gl_s.a clean : -@ rm -f *.o *.do $(DSONAME) $(LIBRARY) $(CLEAN) core *~ ../include/*~ makedepend cmap @@ -231,19 +231,19 @@ install: $(LIBNAME) $(DSONAME) $(GLLIBNAME) $(GLDSONAME) rm -f $(libdir)/libfltk_s.a;\ cp libfltk_s.a $(libdir); \ fi - if test x$(GLDSONAME) = xlibfltkgl.so.1.1; then\ - rm -f $(libdir)/libfltkgl.so*;\ - cp libfltkgl.so.1.1 $(libdir); \ - ln -s libfltkgl.so.1.1 $(libdir)/libfltkgl.so;\ + if test x$(GLDSONAME) = xlibfltk_gl.so.1.1; then\ + rm -f $(libdir)/libfltk_gl.so*;\ + cp libfltk_gl.so.1.1 $(libdir); \ + ln -s libfltk_gl.so.1.1 $(libdir)/libfltk_gl.so;\ fi - if test x$(GLDSONAME) = xlibfltkgl.sl.1.1; then\ - rm -f $(libdir)/libfltkgl.sl*;\ - cp libfltkgl.sl.1.1 $(libdir); \ - ln -s libfltkgl.sl.1.1 $(libdir)/libfltkgl.sl;\ + if test x$(GLDSONAME) = xlibfltk_gl.sl.1.1; then\ + rm -f $(libdir)/libfltk_gl.sl*;\ + cp libfltk_gl.sl.1.1 $(libdir); \ + ln -s libfltk_gl.sl.1.1 $(libdir)/libfltk_gl.sl;\ fi - if test x$(GLDSONAME) = xlibfltkgl_s.a; then\ - rm -f $(libdir)/libfltkgl_s.a;\ - cp libfltkgl_s.a $(libdir); \ + if test x$(GLDSONAME) = xlibfltk_gl_s.a; then\ + rm -f $(libdir)/libfltk_gl_s.a;\ + cp libfltk_gl_s.a $(libdir); \ fi echo "Installing include files..." -mkdir -p $(includedir) @@ -258,5 +258,5 @@ install: $(LIBNAME) $(DSONAME) $(GLLIBNAME) $(GLDSONAME) ln -s FL $(includedir)/Fl # -# End of "$Id: Makefile,v 1.18.2.14.2.10 2001/09/29 14:38:59 easysw Exp $". +# End of "$Id: Makefile,v 1.18.2.14.2.11 2001/09/29 15:57:32 easysw Exp $". # -- cgit v1.2.3