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 /jpeg | |
| 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 'jpeg')
| -rw-r--r-- | jpeg/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/jpeg/Makefile b/jpeg/Makefile index fca935c6b..31a5ac70b 100644 --- a/jpeg/Makefile +++ b/jpeg/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 $" # # JPEG library makefile for the Fast Light Toolkit (FLTK). # @@ -41,7 +41,7 @@ OBJS = jmemnobs.o \ jidctflt.o jidctfst.o jidctint.o jidctred.o jquant1.o \ jquant2.o jutils.o jmemmgr.o -LIBJPEG = ../lib/libjpeg$(LIBEXT) +LIBJPEG = ../lib/libfltk_jpeg$(LIBEXT) # @@ -65,9 +65,9 @@ clean: # install: - echo "Installing libjpeg$(LIBEXT) in $(libdir)..." + echo "Installing libfltk_jpeg$(LIBEXT) in $(libdir)..." -$(MKDIR) $(libdir) - $(RM) $(libdir)/libjpeg$(LIBEXT) + $(RM) $(libdir)/libfltk_jpeg$(LIBEXT) $(CP) $(LIBJPEG) $(libdir) @@ -76,12 +76,12 @@ install: # uninstall: - echo "Uninstalling libjpeg$(LIBEXT) in $(libdir)..." - $(RM) $(libdir)/libjpeg$(LIBEXT) + echo "Uninstalling libfltk_jpeg$(LIBEXT) in $(libdir)..." + $(RM) $(libdir)/libfltk_jpeg$(LIBEXT) # -# libjpeg.a +# libfltk_jpeg.a # $(LIBJPEG): $(OBJS) @@ -103,5 +103,5 @@ include makedepend $(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 $". # |