Fix local image library build bug.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3688 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
parent
5f2ae3cf65
commit
7ee19d1140
2
CHANGES
2
CHANGES
@ -17,6 +17,8 @@ CHANGES IN FLTK 1.1.5rc2
|
||||
(STR #445)
|
||||
- Fl_File_Icon::draw() did not support drawing of complex
|
||||
polygons in icon descriptions (STR #???)
|
||||
- Fl_File_Icon::draw() did not support drawing of complex
|
||||
polygons in icon descriptions (STR #???)
|
||||
- The configure script now offers options for JPEG, PNG,
|
||||
and ZLIB libraries (STR #416)
|
||||
- The first menu item in a list would not go invisible
|
||||
|
||||
14
configure.in
14
configure.in
@ -1,7 +1,7 @@
|
||||
dnl -*- sh -*-
|
||||
dnl the "configure" script is made from this by running GNU "autoconf"
|
||||
dnl
|
||||
dnl "$Id: configure.in,v 1.33.2.31.2.113 2004/07/12 15:50:01 easysw Exp $"
|
||||
dnl "$Id: configure.in,v 1.33.2.31.2.114 2004/07/23 19:26:25 easysw Exp $"
|
||||
dnl
|
||||
dnl Configuration script for the Fast Light Tool Kit (FLTK).
|
||||
dnl
|
||||
@ -83,6 +83,7 @@ LINKFLTKGL="-lfltk_gl"
|
||||
LINKFLTKIMG="-lfltk_images"
|
||||
GLDEMOS="gldemos"
|
||||
|
||||
LIBEXT=".a"
|
||||
LIBNAME="../lib/libfltk.a"
|
||||
FLLIBNAME="../lib/libfltk_forms.a"
|
||||
GLLIBNAME="../lib/libfltk_gl.a"
|
||||
@ -92,6 +93,7 @@ AC_SUBST(FLLIBNAME)
|
||||
AC_SUBST(GLDEMOS)
|
||||
AC_SUBST(GLLIBNAME)
|
||||
AC_SUBST(IMGLIBNAME)
|
||||
AC_SUBST(LIBEXT)
|
||||
AC_SUBST(LIBNAME)
|
||||
AC_SUBST(LINKFLTK)
|
||||
AC_SUBST(LINKFLTKGL)
|
||||
@ -373,7 +375,7 @@ AC_CHECK_LIB(jpeg,jpeg_CreateCompress,
|
||||
IMAGELIBS="-ljpeg $IMAGELIBS",
|
||||
JPEGINC="-I../jpeg"
|
||||
JPEG="jpeg"
|
||||
IMAGELIBS="../jpeg/libjpeg.a $IMAGELIBS")
|
||||
IMAGELIBS="../lib/libjpeg.a $IMAGELIBS")
|
||||
|
||||
AC_ARG_ENABLE(localzlib, [ --enable-localzlib use local ZLIB library, default=auto],
|
||||
[if eval "test x$enable_localzlib = xyes"; then
|
||||
@ -387,8 +389,8 @@ AC_CHECK_LIB(z,gzgets,
|
||||
IMAGELIBS="-lz $IMAGELIBS",
|
||||
ZLIBINC="-I../zlib"
|
||||
ZLIB="zlib"
|
||||
LIBS="../zlib/libz.a $LIBS"
|
||||
IMAGELIBS="../zlib/libz.a $IMAGELIBS")
|
||||
LIBS="../lib/libz.a $LIBS"
|
||||
IMAGELIBS="../lib/libz.a $IMAGELIBS")
|
||||
|
||||
AC_ARG_ENABLE(localpng, [ --enable-localpng use local PNG library, default=auto],
|
||||
[if eval "test x$enable_localpng = xyes"; then
|
||||
@ -403,7 +405,7 @@ AC_CHECK_LIB(png,png_set_tRNS_to_alpha, [
|
||||
AC_DEFINE(HAVE_PNG_H)
|
||||
PNGINC="-I../png"
|
||||
PNG="png"
|
||||
IMAGELIBS="../png/libpng.a $IMAGELIBS"])
|
||||
IMAGELIBS="../lib/libpng.a $IMAGELIBS"])
|
||||
|
||||
AC_SUBST(JPEG)
|
||||
AC_SUBST(JPEGINC)
|
||||
@ -896,5 +898,5 @@ dnl Make sure the fltk-config script is executable...
|
||||
chmod +x fltk-config
|
||||
|
||||
dnl
|
||||
dnl End of "$Id: configure.in,v 1.33.2.31.2.113 2004/07/12 15:50:01 easysw Exp $".
|
||||
dnl End of "$Id: configure.in,v 1.33.2.31.2.114 2004/07/23 19:26:25 easysw Exp $".
|
||||
dnl
|
||||
|
||||
@ -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 $".
|
||||
#
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# "$Id: makeinclude.mingw,v 1.1.2.3.2.12 2004/06/01 14:49:51 easysw Exp $"
|
||||
# "$Id: makeinclude.mingw,v 1.1.2.3.2.13 2004/07/23 19:26:26 easysw Exp $"
|
||||
#
|
||||
# Make include file for the Fast Light Tool Kit (FLTK).
|
||||
# (this file for MingW using GCC 2.95.x)
|
||||
@ -81,6 +81,7 @@ FLLIBNAME = ../lib/libfltk_forms.a
|
||||
GLLIBNAME = ../lib/libfltk_gl.a
|
||||
IMGLIBNAME = ../lib/libfltk_images.a
|
||||
LIBCOMMAND = ar -ruv
|
||||
LIBEXT = .a
|
||||
RANLIB = ranlib
|
||||
DSONAME =
|
||||
FLDSONAME =
|
||||
@ -122,5 +123,5 @@ THREADS =threads
|
||||
$(CXX) -I.. $(CXXFLAGS) $< -c
|
||||
|
||||
#
|
||||
# End of "$Id: makeinclude.mingw,v 1.1.2.3.2.12 2004/06/01 14:49:51 easysw Exp $".
|
||||
# End of "$Id: makeinclude.mingw,v 1.1.2.3.2.13 2004/07/23 19:26:26 easysw Exp $".
|
||||
#
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# "$Id: makeinclude.mingw31,v 1.1.2.3 2003/01/30 21:41:09 easysw Exp $"
|
||||
# "$Id: makeinclude.mingw31,v 1.1.2.4 2004/07/23 19:26:26 easysw Exp $"
|
||||
#
|
||||
# Make include file for the Fast Light Tool Kit (FLTK).
|
||||
# (this file for MingW using GCC 3.1.x)
|
||||
@ -81,6 +81,7 @@ FLLIBNAME = ../lib/libfltk_forms.a
|
||||
GLLIBNAME = ../lib/libfltk_gl.a
|
||||
IMGLIBNAME = ../lib/libfltk_images.a
|
||||
LIBCOMMAND = ar -ruv
|
||||
LIBEXT = .a
|
||||
RANLIB = ranlib
|
||||
DSONAME =
|
||||
FLDSONAME =
|
||||
@ -122,5 +123,5 @@ THREADS =threads
|
||||
$(CXX) -I.. $(CXXFLAGS) $< -c
|
||||
|
||||
#
|
||||
# End of "$Id: makeinclude.mingw31,v 1.1.2.3 2003/01/30 21:41:09 easysw Exp $".
|
||||
# End of "$Id: makeinclude.mingw31,v 1.1.2.4 2004/07/23 19:26:26 easysw Exp $".
|
||||
#
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# "$Id: makeinclude.os2x,v 1.1.2.4.2.12 2003/11/03 00:36:50 easysw Exp $"
|
||||
# "$Id: makeinclude.os2x,v 1.1.2.4.2.13 2004/07/23 19:26:26 easysw Exp $"
|
||||
#
|
||||
# Make include file for the Fast Light Tool Kit (FLTK).
|
||||
#
|
||||
@ -60,6 +60,7 @@ FLLIBNAME = ../lib/libfltk_forms.a
|
||||
GLLIBNAME =
|
||||
IMGLIBNAME = ../lib/libfltk_images.a
|
||||
LIBCOMMAND = ar.exe cr
|
||||
LIBEXT = .a
|
||||
RANLIB = ar.exe s
|
||||
DSONAME =
|
||||
FLDSONAME =
|
||||
@ -124,5 +125,5 @@ CAT3EXT =3
|
||||
mv t.z $@
|
||||
|
||||
#
|
||||
# End of "$Id: makeinclude.os2x,v 1.1.2.4.2.12 2003/11/03 00:36:50 easysw Exp $".
|
||||
# End of "$Id: makeinclude.os2x,v 1.1.2.4.2.13 2004/07/23 19:26:26 easysw Exp $".
|
||||
#
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# "$Id: makeinclude.in,v 1.7.2.11.2.27 2004/07/06 00:18:48 easysw Exp $"
|
||||
# "$Id: makeinclude.in,v 1.7.2.11.2.28 2004/07/23 19:26:25 easysw Exp $"
|
||||
#
|
||||
# Make include file for the Fast Light Tool Kit (FLTK).
|
||||
#
|
||||
@ -61,6 +61,7 @@ FLLIBNAME = @FLLIBNAME@
|
||||
GLLIBNAME = @GLLIBNAME@
|
||||
IMGLIBNAME = @IMGLIBNAME@
|
||||
LIBCOMMAND = @LIBCOMMAND@
|
||||
LIBEXT = @LIBEXT@
|
||||
RANLIB = @RANLIB@
|
||||
DSONAME = @DSONAME@
|
||||
FLDSONAME = @FLDSONAME@
|
||||
@ -132,5 +133,5 @@ CAT3EXT = @CAT3EXT@
|
||||
mv t.z $@
|
||||
|
||||
#
|
||||
# End of "$Id: makeinclude.in,v 1.7.2.11.2.27 2004/07/06 00:18:48 easysw Exp $".
|
||||
# End of "$Id: makeinclude.in,v 1.7.2.11.2.28 2004/07/23 19:26:25 easysw Exp $".
|
||||
#
|
||||
|
||||
27
png/Makefile
27
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 $".
|
||||
#
|
||||
|
||||
44
src/Makefile
44
src/Makefile
@ -1,5 +1,5 @@
|
||||
#
|
||||
# "$Id: Makefile,v 1.18.2.14.2.56 2004/04/11 04:38:59 easysw Exp $"
|
||||
# "$Id: Makefile,v 1.18.2.14.2.57 2004/07/23 19:26:26 easysw Exp $"
|
||||
#
|
||||
# Library makefile for the Fast Light Tool Kit (FLTK).
|
||||
#
|
||||
@ -195,20 +195,20 @@ all: $(LIBNAME) $(DSONAME) \
|
||||
|
||||
$(LIBNAME): $(OBJECTS)
|
||||
echo $(LIBCOMMAND) $@ ...
|
||||
-$(RM) $@
|
||||
$(RM) $@
|
||||
$(LIBCOMMAND) $@ $(OBJECTS)
|
||||
$(RANLIB) $@
|
||||
|
||||
libfltk.so.1.1: $(OBJECTS)
|
||||
echo $(DSOCOMMAND) $@ ...
|
||||
$(DSOCOMMAND) $@ $(OBJECTS)
|
||||
-$(RM) libfltk.so
|
||||
$(RM) libfltk.so
|
||||
$(LN) libfltk.so.1.1 libfltk.so
|
||||
|
||||
libfltk.sl.1.1: $(OBJECTS)
|
||||
echo $(DSOCOMMAND) $@ ...
|
||||
$(DSOCOMMAND) $@ $(OBJECTS)
|
||||
-$(RM) libfltk.sl
|
||||
$(RM) libfltk.sl
|
||||
$(LN) libfltk.sl.1.1 libfltk.sl
|
||||
|
||||
libfltk.1.1.dylib: $(OBJECTS)
|
||||
@ -218,33 +218,33 @@ libfltk.1.1.dylib: $(OBJECTS)
|
||||
-current_version 1.1.4 \
|
||||
-compatibility_version 1.1.0 \
|
||||
$(OBJECTS) $(LDLIBS)
|
||||
-$(RM) libfltk.dylib
|
||||
$(RM) libfltk.dylib
|
||||
$(LN) libfltk.1.1.dylib libfltk.dylib
|
||||
|
||||
libfltk_s.a: $(OBJECTS)
|
||||
echo $(DSOCOMMAND) libfltk_s.o ...
|
||||
$(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS)
|
||||
echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o
|
||||
-$(RM) $@
|
||||
$(RM) $@
|
||||
$(LIBCOMMAND) libfltk_s.a libfltk_s.o
|
||||
$(CHMOD) +x libfltk_s.a
|
||||
|
||||
$(FLLIBNAME): $(FLOBJECTS)
|
||||
echo $(LIBCOMMAND) $@ ...
|
||||
-$(RM) $@
|
||||
$(RM) $@
|
||||
$(LIBCOMMAND) $@ $(FLOBJECTS)
|
||||
$(RANLIB) $@
|
||||
|
||||
libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
|
||||
echo $(DSOCOMMAND) $@ ...
|
||||
$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
|
||||
-$(RM) libfltk_forms.so
|
||||
$(RM) libfltk_forms.so
|
||||
$(LN) libfltk_forms.so.1.1 libfltk_forms.so
|
||||
|
||||
libfltk_forms.sl.1.1: $(FLOBJECTS) libfltk.sl.1.1
|
||||
echo $(DSOCOMMAND) $@ ...
|
||||
$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
|
||||
-$(RM) libfltk_forms.sl
|
||||
$(RM) libfltk_forms.sl
|
||||
$(LN) libfltk_forms.sl.1.1 libfltk_forms.sl
|
||||
|
||||
libfltk_forms.1.1.dylib: $(FLOBJECTS) libfltk.1.1.dylib
|
||||
@ -254,33 +254,33 @@ libfltk_forms.1.1.dylib: $(FLOBJECTS) libfltk.1.1.dylib
|
||||
-current_version 1.1.4 \
|
||||
-compatibility_version 1.1.0 \
|
||||
$(FLOBJECTS) $(LDLIBS) -L. -lfltk
|
||||
-$(RM) libfltk_forms.dylib
|
||||
$(RM) libfltk_forms.dylib
|
||||
$(LN) libfltk_forms.1.1.dylib libfltk_forms.dylib
|
||||
|
||||
libfltk_forms_s.a: $(FLOBJECTS)
|
||||
echo $(DSOCOMMAND) libfltk_forms_s.o ...
|
||||
$(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS)
|
||||
echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
|
||||
-$(RM) $@
|
||||
$(RM) $@
|
||||
$(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
|
||||
$(CHMOD) +x libfltk_forms_s.a
|
||||
|
||||
$(GLLIBNAME): $(GLOBJECTS)
|
||||
echo $(LIBCOMMAND) $@ ...
|
||||
-$(RM) $@
|
||||
$(RM) $@
|
||||
$(LIBCOMMAND) $@ $(GLOBJECTS)
|
||||
$(RANLIB) $@
|
||||
|
||||
libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
|
||||
echo $(DSOCOMMAND) $@ ...
|
||||
$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
|
||||
-$(RM) libfltk_gl.so
|
||||
$(RM) libfltk_gl.so
|
||||
$(LN) libfltk_gl.so.1.1 libfltk_gl.so
|
||||
|
||||
libfltk_gl.sl.1.1: $(GLOBJECTS) libfltk.sl.1.1
|
||||
echo $(DSOCOMMAND) $@ ...
|
||||
$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
|
||||
-$(RM) libfltk_gl.sl
|
||||
$(RM) libfltk_gl.sl
|
||||
$(LN) libfltk_gl.sl.1.1 libfltk_gl.sl
|
||||
|
||||
libfltk_gl.1.1.dylib: $(GLOBJECTS) libfltk.1.1.dylib
|
||||
@ -290,33 +290,33 @@ libfltk_gl.1.1.dylib: $(GLOBJECTS) libfltk.1.1.dylib
|
||||
-current_version 1.1.4 \
|
||||
-compatibility_version 1.1.0 \
|
||||
$(GLOBJECTS) $(GLDLIBS) -L. -lfltk
|
||||
-$(RM) libfltk_gl.dylib
|
||||
$(RM) libfltk_gl.dylib
|
||||
$(LN) libfltk_gl.1.1.dylib libfltk_gl.dylib
|
||||
|
||||
libfltk_gl_s.a: $(GLOBJECTS)
|
||||
echo $(DSOCOMMAND) libfltk_gl_s.o ...
|
||||
$(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS)
|
||||
echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
|
||||
-$(RM) $@
|
||||
$(RM) $@
|
||||
$(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
|
||||
$(CHMOD) +x libfltk_gl_s.a
|
||||
|
||||
$(IMGLIBNAME): $(IMGOBJECTS)
|
||||
echo $(LIBCOMMAND) $@ ...
|
||||
-$(RM) $@
|
||||
$(RM) $@
|
||||
$(LIBCOMMAND) $@ $(IMGOBJECTS)
|
||||
$(RANLIB) $@
|
||||
|
||||
libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
|
||||
echo $(DSOCOMMAND) $@ ...
|
||||
$(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk
|
||||
-$(RM) libfltk_images.so
|
||||
$(RM) libfltk_images.so
|
||||
$(LN) libfltk_images.so.1.1 libfltk_images.so
|
||||
|
||||
libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1
|
||||
echo $(DSOCOMMAND) $@ ...
|
||||
$(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk
|
||||
-$(RM) libfltk_images.sl
|
||||
$(RM) libfltk_images.sl
|
||||
$(LN) libfltk_images.sl.1.1 libfltk_images.sl
|
||||
|
||||
libfltk_images.1.1.dylib: $(IMGOBJECTS) libfltk.1.1.dylib
|
||||
@ -326,14 +326,14 @@ libfltk_images.1.1.dylib: $(IMGOBJECTS) libfltk.1.1.dylib
|
||||
-current_version 1.1.4 \
|
||||
-compatibility_version 1.1.0 \
|
||||
$(IMGOBJECTS) $(LDLIBS) $(IMAGELIBS) -L. -lfltk
|
||||
-$(RM) libfltk_images.dylib
|
||||
$(RM) libfltk_images.dylib
|
||||
$(LN) libfltk_images.1.1.dylib libfltk_images.dylib
|
||||
|
||||
libfltk_images_s.a: $(IMGOBJECTS)
|
||||
echo $(DSOCOMMAND) libfltk_images_s.o ...
|
||||
$(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS)
|
||||
echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
|
||||
-$(RM) $@
|
||||
$(RM) $@
|
||||
$(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
|
||||
$(CHMOD) +x libfltk_images_s.a
|
||||
|
||||
@ -583,5 +583,5 @@ uninstall:
|
||||
|
||||
|
||||
#
|
||||
# End of "$Id: Makefile,v 1.18.2.14.2.56 2004/04/11 04:38:59 easysw Exp $".
|
||||
# End of "$Id: Makefile,v 1.18.2.14.2.57 2004/07/23 19:26:26 easysw Exp $".
|
||||
#
|
||||
|
||||
@ -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 $".
|
||||
#
|
||||
|
||||
Loading…
Reference in New Issue
Block a user