diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-07-23 19:26:27 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-07-23 19:26:27 +0000 |
| commit | 7ee19d11402525a19a405753b3a468f30cc54a37 (patch) | |
| tree | 0136b3185dd1835f6b2f1db56b64ff001f284630 /png | |
| parent | 5f2ae3cf65c10b083621db7fc4cafb9db344e2cf (diff) | |
Fix local image library build bug.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3688 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'png')
| -rw-r--r-- | png/Makefile | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/png/Makefile b/png/Makefile index 844f3c256..276cdf6d3 100644 --- a/png/Makefile +++ b/png/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.1.2.2 2004/07/06 00:18:48 easysw Exp $" +# "$Id: Makefile,v 1.1.2.3 2004/07/23 19:26:26 easysw Exp $" # # PNG library makefile for the Fast Light Toolkit (FLTK). # @@ -33,12 +33,14 @@ 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) + # # Make all of the targets... # -all: libpng.a +all: $(LIBPNG) # @@ -47,18 +49,19 @@ all: libpng.a clean: $(RM) $(OBJS) - $(RM) libpng.a + $(RM) $(LIBPNG) # # Install everything... # -install: libpng.a - echo "Installing libpng.a in $(libdir)..." +install: $(LIBPNG) + echo "Installing libpng$(LIBEXT) in $(libdir)..." -$(MKDIR) $(libdir) - $(RM) $(libdir)/libpng.a - -$(CP) libpng.a $(libdir) + $(RM) $(libdir)/libpng$(LIBEXT) + $(CP) $(LIBPNG) $(libdir) + $(RANLIB) $(libdir)/libpng$(LIBEXT) # @@ -66,18 +69,18 @@ install: libpng.a # uninstall: - echo "Uninstalling libpng.a in $(libdir)..." - $(RM) $(libdir)/libpng.a + echo "Uninstalling libpng$(LIBEXT) in $(libdir)..." + $(RM) $(libdir)/libpng$(LIBEXT) # # libpng.a # -libpng.a: $(OBJS) +$(LIBPNG): $(OBJS) echo Archiving $@... $(RM) $@ - $(AR) $(ARFLAGS) $@ $(OBJS) + $(LIBCOMMAND) $@ $(OBJS) $(RANLIB) $@ @@ -94,5 +97,5 @@ $(OBJS): ../makeinclude # -# End of "$Id: Makefile,v 1.1.2.2 2004/07/06 00:18:48 easysw Exp $". +# End of "$Id: Makefile,v 1.1.2.3 2004/07/23 19:26:26 easysw Exp $". # |