Install image header files in FL/images so that FLTK apps will use the

same headers as the image libraries FLTK uses.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3804 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2004-09-06 11:20:53 +00:00
parent 98a0be3965
commit d7fe9245b4
5 changed files with 39 additions and 9 deletions

View File

@ -1,9 +1,13 @@
CHANGES IN FLTK 1.1.5rc3
- added test/unittests to verify pixel drawing and
- Added test/unittests to verify pixel drawing and
alignment across platforms
- Fl_Menu_::find_item() didn't determine the menu path
properly (STR #481)
- The build system now installs image library header
files in FL/images/filename.h so that FLTK programs
will use the same header files as the FLTK image
libraries.
- The build system now creates image libraries named
"libfltk_name.a" instead of "libname.a" to avoid
clobbering an existing installed library (STR #480)

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# "$Id: fltk-config.in,v 1.12.2.25 2004/08/05 20:20:51 easysw Exp $"
# "$Id: fltk-config.in,v 1.12.2.26 2004/09/06 11:20:52 easysw Exp $"
#
# FLTK configuration utility.
#
@ -55,6 +55,11 @@ CXXFLAGS="@CXXFLAGS@"
LDFLAGS="@LDFLAGS@"
LDLIBS="@LIBS@"
if test -d $includedir/FL/images; then
CFLAGS="-I$includedir/FL/images $CFLAGS"
CXXFLAGS="-I$includedir/FL/images $CXXFLAGS"
fi
# libraries to link with:
LIBNAME="@LIBNAME@"
DSONAME="@DSONAME@"
@ -266,5 +271,5 @@ if test "$echo_libs" = "yes"; then
fi
#
# End of "$Id: fltk-config.in,v 1.12.2.25 2004/08/05 20:20:51 easysw Exp $".
# End of "$Id: fltk-config.in,v 1.12.2.26 2004/09/06 11:20:52 easysw Exp $".
#

View File

@ -1,5 +1,5 @@
#
# "$Id: Makefile,v 1.1.2.4 2004/07/29 18:13:11 easysw Exp $"
# "$Id: Makefile,v 1.1.2.5 2004/09/06 11:20:53 easysw Exp $"
#
# JPEG library makefile for the Fast Light Toolkit (FLTK).
#
@ -69,6 +69,9 @@ install:
-$(MKDIR) $(libdir)
$(RM) $(libdir)/libfltk_jpeg$(LIBEXT)
$(CP) $(LIBJPEG) $(libdir)
echo "Installing jpeg headers in $(includedir)/FL/images..."
-$(MKDIR) $(includedir)/FL/images
$(CP) jconfig.h jerror.h jmorecfg.h jpeglib.h $(includedir)/FL/images
#
@ -78,6 +81,11 @@ install:
uninstall:
echo "Uninstalling libfltk_jpeg$(LIBEXT) in $(libdir)..."
$(RM) $(libdir)/libfltk_jpeg$(LIBEXT)
echo "Uninstalling jpeg headers in $(includedir)/FL/images..."
$(RM) $(includedir)/FL/images/jconfig.h
$(RM) $(includedir)/FL/images/jerror.h
$(RM) $(includedir)/FL/images/jmorecfg.h
$(RM) $(includedir)/FL/images/jpeglib.h
#
@ -103,5 +111,5 @@ include makedepend
$(OBJS): ../makeinclude
#
# End of "$Id: Makefile,v 1.1.2.4 2004/07/29 18:13:11 easysw Exp $".
# End of "$Id: Makefile,v 1.1.2.5 2004/09/06 11:20:53 easysw Exp $".
#

View File

@ -1,5 +1,5 @@
#
# "$Id: Makefile,v 1.1.2.4 2004/07/29 18:13:11 easysw Exp $"
# "$Id: Makefile,v 1.1.2.5 2004/09/06 11:20:53 easysw Exp $"
#
# PNG library makefile for the Fast Light Toolkit (FLTK).
#
@ -62,6 +62,9 @@ install: $(LIBPNG)
$(RM) $(libdir)/libfltk_png$(LIBEXT)
$(CP) $(LIBPNG) $(libdir)
$(RANLIB) $(libdir)/libfltk_png$(LIBEXT)
echo "Installing png headers in $(includedir)/FL/images..."
-$(MKDIR) $(includedir)/FL/images
$(CP) png.h pngconf.h $(includedir)/FL/images
#
@ -71,6 +74,9 @@ install: $(LIBPNG)
uninstall:
echo "Uninstalling libfltk_png$(LIBEXT) in $(libdir)..."
$(RM) $(libdir)/libfltk_png$(LIBEXT)
echo "Uninstalling png headers in $(includedir)/FL/images..."
$(RM) $(includedir)/FL/images/png.h
$(RM) $(includedir)/FL/images/pngconf.h
#
@ -97,5 +103,5 @@ $(OBJS): ../makeinclude
#
# End of "$Id: Makefile,v 1.1.2.4 2004/07/29 18:13:11 easysw Exp $".
# End of "$Id: Makefile,v 1.1.2.5 2004/09/06 11:20:53 easysw Exp $".
#

View File

@ -1,5 +1,5 @@
#
# "$Id: Makefile,v 1.1.2.4 2004/07/29 18:13:11 easysw Exp $"
# "$Id: Makefile,v 1.1.2.5 2004/09/06 11:20:53 easysw Exp $"
#
# GNU ZIP library makefile for the Fast Light Toolkit (FLTK).
#
@ -63,6 +63,9 @@ install: $(LIBZ)
$(RM) $(libdir)/libfltk_z$(LIBEXT)
$(CP) $(LIBZ) $(libdir)
$(RANLIB) $(libdir)/libfltk_z$(LIBEXT)
echo "Installing zlib headers in $(includedir)/FL/images..."
-$(MKDIR) $(includedir)/FL/images
$(CP) zconf.h zlib.h zutil.h $(includedir)/FL/images
#
@ -72,6 +75,10 @@ install: $(LIBZ)
uninstall:
echo "Uninstalling libfltk_z$(LIBEXT) in $(libdir)..."
$(RM) $(libdir)/libfltk_z$(LIBEXT)
echo "Uninstalling zlib headers in $(includedir)/FL/images..."
$(RM) $(includedir)/FL/images/zconf.h
$(RM) $(includedir)/FL/images/zlib.h
$(RM) $(includedir)/FL/images/zutil.h
#
@ -97,5 +104,5 @@ $(OBJS): ../makeinclude
#
# End of "$Id: Makefile,v 1.1.2.4 2004/07/29 18:13:11 easysw Exp $".
# End of "$Id: Makefile,v 1.1.2.5 2004/09/06 11:20:53 easysw Exp $".
#