diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-07-29 18:13:11 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-07-29 18:13:11 +0000 |
| commit | b98e54a92f46aee58970fd608a3d770067e59f08 (patch) | |
| tree | d4c052ed6c74a5963baa84519cf3fc9bfbe5f35d /png/Makefile | |
| parent | 601f7d070821845e89010ff1a7526b976f6bbeea (diff) | |
Remove the GCC -Wshadow option.
Use fltk_xyz for the PNG, JPEG, and ZLIB libraries instead of the normal
names, to avoid collisions with existing installs.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3727 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'png/Makefile')
| -rw-r--r-- | png/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/png/Makefile b/png/Makefile index 276cdf6d3..7f17d77cc 100644 --- a/png/Makefile +++ b/png/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.1.2.3 2004/07/23 19:26:26 easysw Exp $" +# "$Id: Makefile,v 1.1.2.4 2004/07/29 18:13:11 easysw Exp $" # # PNG library makefile for the Fast Light Toolkit (FLTK). # @@ -33,7 +33,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngwtran.o pngmem.o pngerror.o pngpread.o -LIBPNG = ../lib/libpng$(LIBEXT) +LIBPNG = ../lib/libfltk_png$(LIBEXT) # @@ -57,11 +57,11 @@ clean: # install: $(LIBPNG) - echo "Installing libpng$(LIBEXT) in $(libdir)..." + echo "Installing libfltk_png$(LIBEXT) in $(libdir)..." -$(MKDIR) $(libdir) - $(RM) $(libdir)/libpng$(LIBEXT) + $(RM) $(libdir)/libfltk_png$(LIBEXT) $(CP) $(LIBPNG) $(libdir) - $(RANLIB) $(libdir)/libpng$(LIBEXT) + $(RANLIB) $(libdir)/libfltk_png$(LIBEXT) # @@ -69,12 +69,12 @@ install: $(LIBPNG) # uninstall: - echo "Uninstalling libpng$(LIBEXT) in $(libdir)..." - $(RM) $(libdir)/libpng$(LIBEXT) + echo "Uninstalling libfltk_png$(LIBEXT) in $(libdir)..." + $(RM) $(libdir)/libfltk_png$(LIBEXT) # -# libpng.a +# libfltk_png.a # $(LIBPNG): $(OBJS) @@ -97,5 +97,5 @@ $(OBJS): ../makeinclude # -# End of "$Id: Makefile,v 1.1.2.3 2004/07/23 19:26:26 easysw Exp $". +# End of "$Id: Makefile,v 1.1.2.4 2004/07/29 18:13:11 easysw Exp $". # |