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 /zlib/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 'zlib/Makefile')
| -rw-r--r-- | zlib/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/zlib/Makefile b/zlib/Makefile index 66040203b..7b4372b5a 100644 --- a/zlib/Makefile +++ b/zlib/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.1.2.3 2004/07/23 19:26:27 easysw Exp $" +# "$Id: Makefile,v 1.1.2.4 2004/07/29 18:13:11 easysw Exp $" # # GNU ZIP library makefile for the Fast Light Toolkit (FLTK). # @@ -34,7 +34,7 @@ OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o \ trees.o zutil.o inflate.o infblock.o inftrees.o infcodes.o \ infutil.o inffast.o -LIBZ = ../lib/libz$(LIBEXT) +LIBZ = ../lib/libfltk_z$(LIBEXT) # @@ -58,11 +58,11 @@ clean: # install: $(LIBZ) - echo "Installing libz$(LIBEXT) in $(libdir)..." + echo "Installing libfltk_z$(LIBEXT) in $(libdir)..." -$(MKDIR) $(libdir) - $(RM) $(libdir)/libz$(LIBEXT) + $(RM) $(libdir)/libfltk_z$(LIBEXT) $(CP) $(LIBZ) $(libdir) - $(RANLIB) $(libdir)/libz$(LIBEXT) + $(RANLIB) $(libdir)/libfltk_z$(LIBEXT) # @@ -70,12 +70,12 @@ install: $(LIBZ) # uninstall: - echo "Uninstalling libz$(LIBEXT) in $(libdir)..." - $(RM) $(libdir)/libz$(LIBEXT) + echo "Uninstalling libfltk_z$(LIBEXT) in $(libdir)..." + $(RM) $(libdir)/libfltk_z$(LIBEXT) # -# libz.a +# libfltk_z.a # $(LIBZ): $(OBJS) @@ -97,5 +97,5 @@ $(OBJS): ../makeinclude # -# End of "$Id: Makefile,v 1.1.2.3 2004/07/23 19:26:27 easysw Exp $". +# End of "$Id: Makefile,v 1.1.2.4 2004/07/29 18:13:11 easysw Exp $". # |