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 /jpeg | |
| 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 'jpeg')
| -rw-r--r-- | jpeg/Makefile | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/jpeg/Makefile b/jpeg/Makefile index eb3e592bb..fca935c6b 100644 --- a/jpeg/Makefile +++ b/jpeg/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 $" # # JPEG library makefile for the Fast Light Toolkit (FLTK). # @@ -41,12 +41,14 @@ OBJS = jmemnobs.o \ jidctflt.o jidctfst.o jidctint.o jidctred.o jquant1.o \ jquant2.o jutils.o jmemmgr.o +LIBJPEG = ../lib/libjpeg$(LIBEXT) + # # Make all targets... # -all: libjpeg.a +all: $(LIBJPEG) # @@ -55,7 +57,7 @@ all: libjpeg.a clean: $(RM) $(OBJS) - $(RM) libjpeg.a + $(RM) $(LIBJPEG) # @@ -63,10 +65,10 @@ clean: # install: - echo "Installing libjpeg.a in $(libdir)..." + echo "Installing libjpeg$(LIBEXT) in $(libdir)..." -$(MKDIR) $(libdir) - $(RM) $(libdir)/libjpeg.a - -$(CP) libjpeg.a $(libdir) + $(RM) $(libdir)/libjpeg$(LIBEXT) + $(CP) $(LIBJPEG) $(libdir) # @@ -74,18 +76,18 @@ install: # uninstall: - echo "Uninstalling libjpeg.a in $(libdir)..." - $(RM) $(libdir)/libjpeg.a + echo "Uninstalling libjpeg$(LIBEXT) in $(libdir)..." + $(RM) $(libdir)/libjpeg$(LIBEXT) # # libjpeg.a # -libjpeg.a: $(OBJS) +$(LIBJPEG): $(OBJS) echo Archiving $@... $(RM) $@ - $(AR) $(ARFLAGS) $@ $(OBJS) + $(LIBCOMMAND) $@ $(OBJS) $(RANLIB) $@ @@ -101,5 +103,5 @@ include makedepend $(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 $". # |