Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-04 15:32:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove the GCC -Wshadow option.

Browse Source 
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
This commit is contained in:
Michael R Sweet
2004-07-29 18:13:11 +00:00
parent 601f7d0708
commit b98e54a92f
5 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
png/Makefile
+9 -9
View File
@@ -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 $".
#