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 /zlib/Makefile | |
| 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 'zlib/Makefile')
| -rw-r--r-- | zlib/Makefile | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/zlib/Makefile b/zlib/Makefile index 57a382285..66040203b 100644 --- a/zlib/Makefile +++ b/zlib/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.1.2.2 2004/07/06 00:18:49 easysw Exp $" +# "$Id: Makefile,v 1.1.2.3 2004/07/23 19:26:27 easysw Exp $" # # GNU ZIP library makefile for the Fast Light Toolkit (FLTK). # @@ -34,12 +34,14 @@ 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) + # # Make all targets... # -all: libz.a +all: $(LIBZ) # @@ -48,18 +50,19 @@ all: libz.a clean: $(RM) $(OBJS) - $(RM) libz.a + $(RM) $(LIBZ) # # Install everything... # -install: libz.a - echo "Installing libz.a in $(libdir)..." +install: $(LIBZ) + echo "Installing libz$(LIBEXT) in $(libdir)..." -$(MKDIR) $(libdir) - $(RM) $(libdir)/libz.a - -$(CP) libz.a $(libdir) + $(RM) $(libdir)/libz$(LIBEXT) + $(CP) $(LIBZ) $(libdir) + $(RANLIB) $(libdir)/libz$(LIBEXT) # @@ -67,18 +70,18 @@ install: libz.a # uninstall: - echo "Uninstalling libz.a in $(libdir)..." - $(RM) $(libdir)/libz.a + echo "Uninstalling libz$(LIBEXT) in $(libdir)..." + $(RM) $(libdir)/libz$(LIBEXT) # # libz.a # -libz.a: $(OBJS) +$(LIBZ): $(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:49 easysw Exp $". +# End of "$Id: Makefile,v 1.1.2.3 2004/07/23 19:26:27 easysw Exp $". # |