diff options
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | FL/Makefile.in | 12 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | documentation/Makefile | 59 | ||||
| -rw-r--r-- | fluid/Makefile | 39 | ||||
| -rw-r--r-- | jpeg/Makefile | 18 | ||||
| -rw-r--r-- | makeinclude.in | 21 | ||||
| -rw-r--r-- | png/Makefile | 20 | ||||
| -rw-r--r-- | src/Makefile | 105 | ||||
| -rw-r--r-- | test/Makefile | 75 | ||||
| -rw-r--r-- | zlib/Makefile | 15 |
12 files changed, 160 insertions, 213 deletions
@@ -2,6 +2,10 @@ CHANGES IN FLTK 1.1.8 - Documentation fixes (STR #1454, STR #1455, STR #1456, STR #1457, STR #1458, STR #1460, STR #1481, STR #1578) + - "make install" now uses the install command (or the + included install-sh script) to copy files to the + install directories, to ensure that permissions are + correct. - Fixed DLL generation via MingW/Cygwin (STR #1546) - FLUID incorrectly opened the display when generating source code for Fl_Help_View widgets (STR #1318) diff --git a/FL/Makefile.in b/FL/Makefile.in index 79385b3b0..bd7b2c914 100644 --- a/FL/Makefile.in +++ b/FL/Makefile.in @@ -3,7 +3,7 @@ # # Header makefile for the Fast Light Tool Kit (FLTK). # -# Copyright 1998-2005 by Bill Spitzak and others. +# Copyright 1998-2007 by Bill Spitzak and others. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public @@ -35,12 +35,12 @@ depend: install: echo "Installing include files in $(DESTDIR)$(includedir)..." - -$(MKDIR) -p $(DESTDIR)$(includedir) + -$(INSTALL_DIR) -p $(DESTDIR)$(includedir) $(RMDIR) $(DESTDIR)$(includedir)/FL - $(MKDIR) $(DESTDIR)$(includedir)/FL - $(CHMOD) 755 $(DESTDIR)$(includedir)/FL - $(CP) ../FL/*.[hHr] $(DESTDIR)$(includedir)/FL - $(CHMOD) 644 $(DESTDIR)$(includedir)/FL/*.[hHr] + $(INSTALL_DIR) $(DESTDIR)$(includedir)/FL + for file in *.[hH]; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/FL; \ + done @HLINKS@ cd $(DESTDIR)$(includedir)/FL;\ @HLINKS@ for file in *.H; do\ @HLINKS@ $(RM) "`basename $$file H`h";\ @@ -38,8 +38,7 @@ all: makeinclude install: makeinclude -mkdir -p $(DESTDIR)$(bindir) $(RM) $(DESTDIR)$(bindir)/fltk-config - -cp fltk-config $(DESTDIR)$(bindir) - -chmod 755 $(DESTDIR)$(bindir)/fltk-config + $(INSTALL_SCRIPT) fltk-config $(DESTDIR)$(bindir) for dir in FL $(DIRS); do\ echo "=== installing $$dir ===";\ (cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\ diff --git a/configure.in b/configure.in index 46579d4da..ab6180f0d 100644 --- a/configure.in +++ b/configure.in @@ -264,7 +264,7 @@ esac dnl Find commands... AC_PROG_CC AC_PROG_CXX -dnl AC_PROG_INSTALL +AC_PROG_INSTALL AC_PATH_PROG(NROFF,nroff) if test "x$NROFF" = "x:"; then AC_PATH_PROG(GROFF,groff) diff --git a/documentation/Makefile b/documentation/Makefile index 23f336428..0ec17f6a7 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -3,7 +3,7 @@ # # Documentation makefile for the Fast Light Tool Kit (FLTK). # -# Copyright 1998-2005 by Bill Spitzak and others. +# Copyright 1998-2007 by Bill Spitzak and others. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public @@ -232,42 +232,31 @@ depend: install: $(MANPAGES) echo "Installing documentation files in $(DESTDIR)$(docdir)..." - -$(MKDIR) $(DESTDIR)$(docdir) - $(CP) $(HTMLFILES) $(IMAGEFILES) index.html $(DESTDIR)$(docdir) - $(CHMOD) 644 $(DESTDIR)$(docdir)/*.* + -$(INSTALL_DIR) $(DESTDIR)$(docdir) + for file in $(HTMLFILES) $(IMAGEFILES) index.html; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(docdir); \ + done echo "Installing man pages in $(DESTDIR)$(mandir)..." - -$(MKDIR) $(DESTDIR)$(mandir)/cat1 - $(CP) fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 - $(CHMOD) 644 $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT) - $(CP) fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 - $(CHMOD) 644 $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT) - -$(MKDIR) $(DESTDIR)$(mandir)/cat3 - $(CP) fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3 - $(CHMOD) 644 $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT) - -$(MKDIR) $(DESTDIR)$(mandir)/man1 - $(CP) fluid.man $(DESTDIR)$(mandir)/man1/fluid.1 - $(CHMOD) 644 $(DESTDIR)$(mandir)/man1/fluid.1 - $(CP) fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1 - $(CHMOD) 644 $(DESTDIR)$(mandir)/man1/fltk-config.1 - -$(MKDIR) $(DESTDIR)$(mandir)/man3 - $(CP) fltk.man $(DESTDIR)$(mandir)/man3/fltk.3 - $(CHMOD) 644 $(DESTDIR)$(mandir)/man3/fltk.3 + -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1 + $(INSTALL_MAN) fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 + $(INSTALL_MAN) fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 + -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3 + $(INSTALL_MAN) fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3 + -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 + $(INSTALL_MAN) fluid.man $(DESTDIR)$(mandir)/man1/fluid.1 + $(INSTALL_MAN) fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1 + -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man3 + $(INSTALL_MAN) fltk.man $(DESTDIR)$(mandir)/man3/fltk.3 install-linux install-osx: - -$(MKDIR) $(DESTDIR)$(mandir)/cat6 - $(CP) blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 - $(CHMOD) 644 $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT) - $(CP) checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 - $(CHMOD) 644 $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT) - $(CP) sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 - $(CHMOD) 644 $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT) - -$(MKDIR) $(DESTDIR)$(mandir)/man6 - $(CP) blocks.man $(DESTDIR)$(mandir)/man6/blocks.6 - $(CHMOD) 644 $(DESTDIR)$(mandir)/man6/blocks.6 - $(CP) checkers.man $(DESTDIR)$(mandir)/man6/checkers.6 - $(CHMOD) 644 $(DESTDIR)$(mandir)/man6/checkers.6 - $(CP) sudoku.man $(DESTDIR)$(mandir)/man6/sudoku.6 - $(CHMOD) 644 $(DESTDIR)$(mandir)/man6/sudoku.6 + -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6 + $(INSTALL_MAN) blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 + $(INSTALL_MAN) checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 + $(INSTALL_MAN) sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 + -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6 + $(INSTALL_MAN) blocks.man $(DESTDIR)$(mandir)/man6/blocks.6 + $(INSTALL_MAN) checkers.man $(DESTDIR)$(mandir)/man6/checkers.6 + $(INSTALL_MAN) sudoku.man $(DESTDIR)$(mandir)/man6/sudoku.6 uninstall: @@ -292,7 +281,7 @@ uninstall-linux uninstall-osx: fltk.d/index.html: $(HTMLFILES) $(IMAGEFILES) echo "Generating HTML documentation..." -$(RMDIR) fltk.d - -$(MKDIR) fltk.d + -$(INSTALL_DIR) fltk.d -$(HTMLDOC) --verbose --batch fltk.book -d fltk.d -t html fltk.ps: $(HTMLFILES) $(IMAGEFILES) diff --git a/fluid/Makefile b/fluid/Makefile index 49bc9185d..54db63960 100644 --- a/fluid/Makefile +++ b/fluid/Makefile @@ -3,7 +3,7 @@ # # FLUID makefile for the Fast Light Tool Kit (FLTK). # -# Copyright 1998-2006 by Bill Spitzak and others. +# Copyright 1998-2007 by Bill Spitzak and others. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public @@ -58,14 +58,12 @@ fluid$(EXEEXT): $(OBJECTS) ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) \ ../lib/$(IMGLIBNAME) echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS) - $(POSTBUILD) $@ ../FL/mac.r $(CP) $@ fluid.app/Contents/MacOS fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \ ../src/$(IMGDSONAME) echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS) - $(POSTBUILD) $@ ../FL/mac.r clean: -$(RM) *.o core.* *~ *.bck *.bck @@ -80,35 +78,32 @@ include makedepend install: all echo "Installing FLUID in $(DESTDIR)$(bindir)..." - -$(MKDIR) $(DESTDIR)$(bindir) - $(CP) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT) - $(STRIP) $(DESTDIR)$(bindir)/fluid$(EXEEXT) - $(DESTDIR)$(bindir)/fltk-config --post $(DESTDIR)$(bindir)/fluid$(EXEEXT) - $(CHMOD) 755 $(DESTDIR)$(bindir)/fluid$(EXEEXT) + -$(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT) install-linux: - -$(MKDIR) $(DESTDIR)/usr/share/applnk/Development - $(CP) fluid.desktop $(DESTDIR)/usr/share/applnk/Development + -$(INSTALL_DIR) $(DESTDIR)/usr/share/applnk/Development + $(INSTALL_DATA) fluid.desktop $(DESTDIR)/usr/share/applnk/Development for size in 16 32 48 64 128; do \ if test ! -d $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; then \ - $(MKDIR) $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; \ + $(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; \ fi; \ - $(CP) icons/fluid-$$size.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/fluid.png; \ + $(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/fluid.png; \ done - -$(MKDIR) $(DESTDIR)/usr/share/mimelnk/application - $(CP) x-fluid.desktop $(DESTDIR)/usr/share/mimelnk/application + -$(INSTALL_DIR) $(DESTDIR)/usr/share/mimelnk/application + $(INSTALL_DATA) x-fluid.desktop $(DESTDIR)/usr/share/mimelnk/application install-osx: echo Installing Fluid in $(DESTDIR)/Applications... - -$(MKDIR) $(DESTDIR)/Applications/fluid.app - -$(MKDIR) $(DESTDIR)/Applications/fluid.app/Contents - $(CP) fluid.app/Contents/Info.plist $(DESTDIR)/Applications/fluid.app/Contents/Info.plist - $(CP) fluid.app/Contents/PkgInfo $(DESTDIR)/Applications/fluid.app/Contents/PkgInfo - -$(MKDIR) $(DESTDIR)/Applications/fluid.app/Contents/MacOS - -$(RM) $(DESTDIR)/Applications/fluid.app/Contents/MacOS/fluid + -$(INSTALL_DIR) $(DESTDIR)/Applications/fluid.app + -$(INSTALL_DIR) $(DESTDIR)/Applications/fluid.app/Contents + $(INSTALL_DATA) fluid.app/Contents/Info.plist $(DESTDIR)/Applications/fluid.app/Contents/Info.plist + $(INSTALL_DATA) fluid.app/Contents/PkgInfo $(DESTDIR)/Applications/fluid.app/Contents/PkgInfo + -$(INSTALL_DIR) $(DESTDIR)/Applications/fluid.app/Contents/MacOS + $(RM) $(DESTDIR)/Applications/fluid.app/Contents/MacOS/fluid $(LN) $(bindir)/fluid $(DESTDIR)/Applications/fluid.app/Contents/MacOS/fluid - -$(MKDIR) $(DESTDIR)/Applications/fluid.app/Contents/Resources - $(CP) fluid.app/Contents/Resources/fluid.icns $(DESTDIR)/Applications/fluid.app/Contents/Resources + -$(INSTALL_DIR) $(DESTDIR)/Applications/fluid.app/Contents/Resources + $(INSTALL_DATA) fluid.app/Contents/Resources/fluid.icns $(DESTDIR)/Applications/fluid.app/Contents/Resources uninstall: $(RM) $(DESTDIR)$(bindir)/fluid$(EXEEXT) diff --git a/jpeg/Makefile b/jpeg/Makefile index 03aa004d2..f7eaf8022 100644 --- a/jpeg/Makefile +++ b/jpeg/Makefile @@ -64,15 +64,17 @@ clean: # Install everything... # -install: - echo "Installing libfltk_jpeg$(LIBEXT) in $(libdir)..." - -$(MKDIR) $(libdir) - $(RM) $(libdir)/libfltk_jpeg$(LIBEXT) - $(CP) $(LIBJPEG) $(libdir) - $(RANLIB) $(libdir)/libfltk_jpeg$(LIBEXT) +install: $(LIBJPEG) + echo "Installing $(LIBJPEG) in $(libdir)..." + -$(INSTALL_DIR) $(DESTDIR)$(libdir) + $(INSTALL_LIB) $(LIBJPEG) $(DESTDIR)$(libdir) + $(RANLIB) $(DESTDIR)$(libdir)/libfltk_jpeg$(LIBEXT) echo "Installing jpeg headers in $(includedir)/FL/images..." - -$(MKDIR) $(includedir)/FL/images - $(CP) jconfig.h jerror.h jmorecfg.h jpeglib.h $(includedir)/FL/images + -$(INSTALL_DIR) $(DESTDIR)$(includedir)/FL/images + $(INSTALL_DATA) jconfig.h $(DESTDIR)$(includedir)/FL/images + $(INSTALL_DATA) jerror.h $(DESTDIR)$(includedir)/FL/images + $(INSTALL_DATA) jmorecfg.h $(DESTDIR)$(includedir)/FL/images + $(INSTALL_DATA) jpeglib.h $(DESTDIR)$(includedir)/FL/images # diff --git a/makeinclude.in b/makeinclude.in index 9d169e9a5..aaf70e4d8 100644 --- a/makeinclude.in +++ b/makeinclude.in @@ -3,7 +3,7 @@ # # Make include file for the Fast Light Tool Kit (FLTK). # -# Copyright 1998-2006 by Bill Spitzak and others. +# Copyright 1998-2007 by Bill Spitzak and others. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public @@ -37,11 +37,9 @@ docdir = $(datadir)/doc/fltk VPATH = @srcdir@ # programs we use... -CHMOD = chmod -CP = cp HTMLDOC = @HTMLDOC@ +INSTALL = @INSTALL@ LN = ln -s -MKDIR = mkdir -p NROFF = @NROFF@ RM = rm -f RMDIR = rm -rf @@ -101,14 +99,22 @@ THREADS = @THREADS@ # Name of FLUID executable we install FLUID = @FLUID@$(EXEEXT) -# Possible steps after linking... -POSTBUILD = @POSTBUILD@ - # Man page extensions... CAT1EXT = @CAT1EXT@ CAT3EXT = @CAT3EXT@ CAT6EXT = @CAT6EXT@ +# +# Installation programs... +# + +INSTALL_BIN = $(INSTALL) -m 755 +INSTALL_DATA = $(INSTALL) -m 644 +INSTALL_DIR = $(INSTALL) -d +INSTALL_LIB = $(INSTALL) -m 755 +INSTALL_MAN = $(INSTALL) -m 644 +INSTALL_SCRIPT = $(INSTALL) -m 755 + # Additional GUI install/uninstall targets... INSTALL_DESKTOP = @INSTALL_DESKTOP@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@ @@ -122,7 +128,6 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@ .o$(EXEEXT): echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ - $(POSTBUILD) $@ ../FL/mac.r .c.o: echo Compiling $<... diff --git a/png/Makefile b/png/Makefile index 1bd2f02f3..b5ace6c1d 100644 --- a/png/Makefile +++ b/png/Makefile @@ -3,7 +3,7 @@ # # PNG library makefile for the Fast Light Toolkit (FLTK). # -# Copyright 1997-2005 by Easy Software Products. +# Copyright 1997-2007 by Easy Software Products. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public @@ -58,13 +58,13 @@ clean: install: $(LIBPNG) echo "Installing libfltk_png$(LIBEXT) in $(libdir)..." - -$(MKDIR) $(libdir) - $(RM) $(libdir)/libfltk_png$(LIBEXT) - $(CP) $(LIBPNG) $(libdir) - $(RANLIB) $(libdir)/libfltk_png$(LIBEXT) + -$(INSTALL_DIR) $(DESTDIR)$(libdir) + $(INSTALL_LIB) libfltk_png$(LIBEXT) $(DESTDIR)$(libdir) + $(RANLIB) $(DESTDIR)$(libdir)/libfltk_png$(LIBEXT) echo "Installing png headers in $(includedir)/FL/images..." - -$(MKDIR) $(includedir)/FL/images - $(CP) png.h pngconf.h $(includedir)/FL/images + -$(INSTALL_DIR) $(DESTDIR)$(includedir)/FL/images + $(INSTALL_DATA) png.h $(DESTDIR)$(includedir)/FL/images + $(INSTALL_DATA) pngconf.h $(DESTDIR)$(includedir)/FL/images # @@ -73,10 +73,10 @@ install: $(LIBPNG) uninstall: echo "Uninstalling libfltk_png$(LIBEXT) in $(libdir)..." - $(RM) $(libdir)/libfltk_png$(LIBEXT) + $(RM) $(DESTDIR)$(libdir)/libfltk_png$(LIBEXT) echo "Uninstalling png headers in $(includedir)/FL/images..." - $(RM) $(includedir)/FL/images/png.h - $(RM) $(includedir)/FL/images/pngconf.h + $(RM) $(DESTDIR)$(includedir)/FL/images/png.h + $(RM) $(DESTDIR)$(includedir)/FL/images/pngconf.h # diff --git a/src/Makefile b/src/Makefile index 156e361a8..a828e5d3a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -485,171 +485,142 @@ install: $(LIBNAME) $(DSONAME) \ $(GLLIBNAME) $(GLDSONAME) \ $(IMGLIBNAME) $(IMGDSONAME) echo "Installing libraries in $(DESTDIR)$(libdir)..." - -$(MKDIR) $(DESTDIR)$(libdir) - -$(MKDIR) $(DESTDIR)$(bindir) + -$(INSTALL_DIR) $(DESTDIR)$(libdir) + -$(INSTALL_DIR) $(DESTDIR)$(bindir) $(RM) $(DESTDIR)$(libdir)/$(LIBNAME) - -$(CP) $(LIBNAME) $(FLLIBNAME) $(GLLIBNAME) $(IMGLIBNAME) $(DESTDIR)$(libdir) + $(INSTALL_LIB) $(LIBNAME) $(DESTDIR)$(libdir) + $(INSTALL_LIB) $(FLLIBNAME) $(DESTDIR)$(libdir) + $(INSTALL_LIB) $(IMGLIBNAME) $(DESTDIR)$(libdir) $(RANLIB) $(DESTDIR)$(libdir)/$(LIBNAME) $(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBNAME) if test x$(GLLIBNAME) != x; then \ + $(INSTALL_LIB) $(GLLIBNAME) $(DESTDIR)$(libdir); \ $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \ fi $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME) if test x$(DSONAME) = xlibfltk.so.1.1; then\ $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\ - $(CP) libfltk.so.1.1 $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk.so.1.1; \ + $(INSTALL_LIB) libfltk.so.1.1 $(DESTDIR)$(libdir); \ $(LN) libfltk.so.1.1 $(DESTDIR)$(libdir)/libfltk.so;\ fi if test x$(DSONAME) = xlibfltk.sl.1.1; then\ $(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\ - $(CP) libfltk.sl.1.1 $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk.sl.1.1; \ + $(INSTALL_LIB) libfltk.sl.1.1 $(DESTDIR)$(libdir); \ $(LN) libfltk.sl.1.1 $(DESTDIR)$(libdir)/libfltk.sl;\ fi if test x$(DSONAME) = xlibfltk.1.1.dylib; then\ $(RM) $(DESTDIR)$(libdir)/libfltk.*dylib;\ - $(CP) libfltk.1.1.dylib $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk.1.1.dylib; \ + $(INSTALL_LIB) libfltk.1.1.dylib $(DESTDIR)$(libdir); \ $(LN) libfltk.1.1.dylib $(DESTDIR)$(libdir)/libfltk.dylib;\ fi if test x$(DSONAME) = xlibfltk_s.a; then\ $(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\ - $(CP) libfltk_s.a $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_s.a; \ + $(INSTALL_LIB) libfltk_s.a $(DESTDIR)$(libdir); \ fi if test x$(DSONAME) = xcygfltknox-1.1.dll; then\ $(RM) $(DESTDIR)$(bindir)/$(DSONAME);\ - $(CP) $(DSONAME) $(DESTDIR)$(bindir); \ - $(CHMOD) 755 $(DESTDIR)$(bindir)/$(DSONAME); \ + $(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \ $(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\ - $(CP) libfltk.dll.a $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk.dll.a; \ + $(INSTALL_LIB) libfltk.dll.a $(DESTDIR)$(libdir); \ fi if test x$(DSONAME) = xmgwfltknox-1.1.dll; then\ $(RM) $(DESTDIR)$(bindir)/$(DSONAME);\ - $(CP) $(DSONAME) $(DESTDIR)$(bindir); \ - $(CHMOD) 755 $(DESTDIR)$(bindir)/$(DSONAME); \ + $(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \ $(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\ - $(CP) libfltk.dll.a $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk.dll.a; \ + $(INSTALL_LIB) libfltk.dll.a $(DESTDIR)$(libdir); \ fi if test x$(FLDSONAME) = xlibfltk_forms.so.1.1; then\ $(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\ - $(CP) libfltk_forms.so.1.1 $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.so.1.1; \ + $(INSTALL_LIB) libfltk_forms.so.1.1 $(DESTDIR)$(libdir); \ $(LN) libfltk_forms.so.1.1 $(DESTDIR)$(libdir)/libfltk_forms.so;\ fi if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\ $(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\ - $(CP) libfltk_forms.sl.1.1 $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.sl.1.1; \ + $(INSTALL_LIB) libfltk_forms.sl.1.1 $(DESTDIR)$(libdir); \ $(LN) libfltk_forms.sl.1.1 $(DESTDIR)$(libdir)/libfltk_forms.sl;\ fi if test x$(FLDSONAME) = xlibfltk_forms.1.1.dylib; then\ $(RM) $(DESTDIR)$(libdir)/libfltk_forms.*dylib;\ - $(CP) libfltk_forms.1.1.dylib $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.1.1.dylib; \ + $(INSTALL_LIB) libfltk_forms.1.1.dylib $(DESTDIR)$(libdir); \ $(LN) libfltk_forms.1.1.dylib $(DESTDIR)$(libdir)/libfltk_forms.dylib;\ fi if test x$(FLDSONAME) = xlibfltk_forms_s.a; then\ $(RM) $(DESTDIR)$(libdir)/libfltk_forms_s.a;\ - $(CP) libfltk_forms_s.a $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.a; \ + $(INSTALL_LIB) libfltk_forms_s.a $(DESTDIR)$(libdir); \ fi if test x$(FLDSONAME) = xcygfltknox_forms-1.1.dll; then\ $(RM) $(DESTDIR)$(bindir)/$(FLDSONAME);\ - $(CP) $(FLDSONAME) $(DESTDIR)$(bindir); \ - $(CHMOD) 755 $(DESTDIR)$(bindir)/$(FLDSONAME); \ + $(INSTALL_LIB) $(FLDSONAME) $(DESTDIR)$(bindir); \ $(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\ - $(CP) libfltk_forms.dll.a $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.dll.a; \ + $(INSTALL_LIB) libfltk_forms.dll.a $(DESTDIR)$(libdir); \ fi if test x$(FLDSONAME) = xmgwfltknox_forms-1.1.dll; then\ $(RM) $(DESTDIR)$(bindir)/$(FLDSONAME);\ - $(CP) $(FLDSONAME) $(DESTDIR)$(bindir); \ - $(CHMOD) 755 $(DESTDIR)$(bindir)/$(FLDSONAME); \ + $(INSTALL_LIB) $(FLDSONAME) $(DESTDIR)$(bindir); \ $(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\ - $(CP) libfltk_forms.dll.a $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.dll.a; \ + $(INSTALL_LIB) libfltk_forms.dll.a $(DESTDIR)$(libdir); \ fi if test x$(GLDSONAME) = xlibfltk_gl.so.1.1; then\ $(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\ - $(CP) libfltk_gl.so.1.1 $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.so.1.1; \ + $(INSTALL_LIB) libfltk_gl.so.1.1 $(DESTDIR)$(libdir); \ $(LN) libfltk_gl.so.1.1 $(DESTDIR)$(libdir)/libfltk_gl.so;\ fi if test x$(GLDSONAME) = xlibfltk_gl.sl.1.1; then\ $(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\ - $(CP) libfltk_gl.sl.1.1 $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.sl.1.1; \ + $(INSTALL_LIB) libfltk_gl.sl.1.1 $(DESTDIR)$(libdir); \ $(LN) libfltk_gl.sl.1.1 $(DESTDIR)$(libdir)/libfltk_gl.sl;\ fi if test x$(GLDSONAME) = xlibfltk_gl.1.1.dylib; then\ $(RM) $(DESTDIR)$(libdir)/libfltk_gl.*dylib;\ - $(CP) libfltk_gl.1.1.dylib $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.1.1.dylib; \ + $(INSTALL_LIB) libfltk_gl.1.1.dylib $(DESTDIR)$(libdir); \ $(LN) libfltk_gl.1.1.dylib $(DESTDIR)$(libdir)/libfltk_gl.dylib;\ fi if test x$(GLDSONAME) = xlibfltk_gl_s.a; then\ $(RM) $(DESTDIR)$(libdir)/libfltk_gl_s.a;\ - $(CP) libfltk_gl_s.a $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.a; \ + $(INSTALL_LIB) libfltk_gl_s.a $(DESTDIR)$(libdir); \ fi if test x$(GLDSONAME) = xcygfltknox_gl-1.1.dll; then\ $(RM) $(DESTDIR)$(bindir)/$(GLDSONAME);\ - $(CP) $(GLDSONAME) $(DESTDIR)$(bindir); \ - $(CHMOD) 755 $(DESTDIR)$(bindir)/$(GLDSONAME); \ + $(INSTALL_LIB) $(GLDSONAME) $(DESTDIR)$(bindir); \ $(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\ - $(CP) libfltk_gl.dll.a $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.dll.a; \ + $(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \ fi if test x$(GLDSONAME) = xmgwfltknox_gl-1.1.dll; then\ $(RM) $(DESTDIR)$(bindir)/$(GLDSONAME);\ - $(CP) $(GLDSONAME) $(DESTDIR)$(bindir); \ - $(CHMOD) 755 $(DESTDIR)$(bindir)/$(GLDSONAME); \ + $(INSTALL_LIB) $(GLDSONAME) $(DESTDIR)$(bindir); \ $(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\ - $(CP) libfltk_gl.dll.a $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.dll.a; \ + $(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \ fi if test x$(IMGDSONAME) = xlibfltk_images.so.1.1; then\ $(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\ - $(CP) libfltk_images.so.1.1 $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_images.so.1.1; \ + $(INSTALL_LIB) libfltk_images.so.1.1 $(DESTDIR)$(libdir); \ $(LN) libfltk_images.so.1.1 $(DESTDIR)$(libdir)/libfltk_images.so;\ fi if test x$(IMGDSONAME) = xlibfltk_images.sl.1.1; then\ $(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\ - $(CP) libfltk_images.sl.1.1 $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_images.sl.1.1; \ + $(INSTALL_LIB) libfltk_images.sl.1.1 $(DESTDIR)$(libdir); \ $(LN) libfltk_images.sl.1.1 $(DESTDIR)$(libdir)/libfltk_images.sl;\ fi if test x$(IMGDSONAME) = xlibfltk_images.1.1.dylib; then\ $(RM) $(DESTDIR)$(libdir)/libfltk_images.*dylib;\ - $(CP) libfltk_images.1.1.dylib $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_images.1.1.dylib; \ + $(INSTALL_LIB) libfltk_images.1.1.dylib $(DESTDIR)$(libdir); \ $(LN) libfltk_images.1.1.dylib $(DESTDIR)$(libdir)/libfltk_images.dylib;\ fi if test x$(IMGDSONAME) = xlibfltk_images_s.a; then\ $(RM) $(DESTDIR)$(libdir)/libfltk_images_s.a;\ - $(CP) libfltk_images_s.a $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_images.a; \ + $(INSTALL_LIB) libfltk_images_s.a $(DESTDIR)$(libdir); \ fi if test x$(IMGDSONAME) = xcygfltknox_images-1.1.dll; then\ $(RM) $(DESTDIR)$(bindir)/$(IMGDSONAME); \ - $(CP) $(IMGDSONAME) $(DESTDIR)$(bindir); \ - $(CHMOD) 755 $(DESTDIR)$(bindir)/$(IMGDSONAME); \ + $(INSTALL_LIB) $(IMGDSONAME) $(DESTDIR)$(bindir); \ $(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\ - $(CP) libfltk_images.dll.a $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_images.dll.a; \ + $(INSTALL_LIB) libfltk_images.dll.a $(DESTDIR)$(libdir); \ fi if test x$(IMGDSONAME) = xmgwfltknox_images-1.1.dll; then\ $(RM) $(DESTDIR)$(bindir)/$(IMGDSONAME); \ - $(CP) $(IMGDSONAME) $(DESTDIR)$(bindir); \ - $(CHMOD) 755 $(DESTDIR)$(bindir)/$(IMGDSONAME); \ + $(INSTALL_LIB) $(IMGDSONAME) $(DESTDIR)$(bindir); \ $(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\ - $(CP) libfltk_images.dll.a $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_images.dll.a; \ + $(INSTALL_LIB) libfltk_images.dll.a $(DESTDIR)$(libdir); \ fi uninstall: diff --git a/test/Makefile b/test/Makefile index 2538e5899..16e7eb4ac 100644 --- a/test/Makefile +++ b/test/Makefile @@ -3,7 +3,7 @@ # # Test/example program makefile for the Fast Light Tool Kit (FLTK). # -# Copyright 1998-2006 by Bill Spitzak and others. +# Copyright 1998-2007 by Bill Spitzak and others. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public @@ -190,39 +190,41 @@ clean: install: all echo "Installing example programs to $(DESTDIR)$(docdir)/examples..." - -$(MKDIR) $(DESTDIR)$(docdir)/examples - $(CP) *.h *.cxx *.fl demo.menu $(DESTDIR)$(docdir)/examples - -$(MKDIR) $(DESTDIR)$(docdir)/examples/pixmaps - $(CP) pixmaps/*.xbm pixmaps/*.xpm $(DESTDIR)$(docdir)/examples/pixmaps - $(CHMOD) 644 $(DESTDIR)$(docdir)/examples/*.* + -$(INSTALL_DIR) $(DESTDIR)$(docdir)/examples + for file in *.h *.cxx *.fl demo.menu; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/examples; \ + done + -$(INSTALL_DIR) $(DESTDIR)$(docdir)/examples/pixmaps + for file in pixmaps/*.xbm pixmaps/*.xpm; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/examples/pixmaps; \ + done install-linux: echo Installing games to $(DESTDIR)$(bindir)... - -$(MKDIR) $(DESTDIR)$(bindir) - -$(MKDIR) $(DESTDIR)/usr/share/applnk/Games - -$(MKDIR) $(DESTDIR)/usr/share/icons/hicolor/32x32/apps - -$(MKDIR) $(DESTDIR)/usr/share/icons/hicolor/128x128/apps + -$(INSTALL_DIR) $(DESTDIR)$(bindir) + -$(INSTALL_DIR) $(DESTDIR)/usr/share/applnk/Games + -$(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/32x32/apps + -$(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/128x128/apps for game in blocks checkers sudoku; do \ - $(CP) $$game $(DESTDIR)$(bindir); \ - $(CHMOD) 755 $(DESTDIR)$(bindir)/$$game; \ - $(CP) desktop/$$game.desktop $(DESTDIR)/usr/share/applnk/Games; \ - $(CP) desktop/$$game-32.png $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/$$game.png; \ - $(CP) desktop/$$game-128.png $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/$$game.png; \ + $(INSTALL_BIN) $$game $(DESTDIR)$(bindir); \ + $(INSTALL_DATA) desktop/$$game.desktop $(DESTDIR)/usr/share/applnk/Games; \ + $(INSTALL_DATA) desktop/$$game-32.png $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/$$game.png; \ + $(INSTALL_DATA) desktop/$$game-128.png $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/$$game.png; \ done install-osx: echo Installing games in $(DESTDIR)/Applications... for game in blocks checkers sudoku; do \ if test ! -d $(DESTDIR)/Applications/$$game.app; then \ - $(MKDIR) $(DESTDIR)/Applications/$$game.app; \ - $(MKDIR) $(DESTDIR)/Applications/$$game.app/Contents; \ - $(MKDIR) $(DESTDIR)/Applications/$$game.app/Contents/MacOS; \ - $(MKDIR) $(DESTDIR)/Applications/$$game.app/Contents/Resources; \ + $(INSTALL_DIR) $(DESTDIR)/Applications/$$game.app; \ + $(INSTALL_DIR) $(DESTDIR)/Applications/$$game.app/Contents; \ + $(INSTALL_DIR) $(DESTDIR)/Applications/$$game.app/Contents/MacOS; \ + $(INSTALL_DIR) $(DESTDIR)/Applications/$$game.app/Contents/Resources; \ fi; \ - $(CP) $$game.app/Contents/Info.plist $(DESTDIR)/Applications/$$game.app/Contents; \ - $(CP) $$game.app/Contents/PkgInfo $(DESTDIR)/Applications/$$game.app/Contents; \ - $(CP) $$game.app/Contents/MacOS/$$game $(DESTDIR)/Applications/$$game.app/Contents/MacOS; \ - $(CP) $$game.app/Contents/Resources/$$game.icns $(DESTDIR)/Applications/$$game.app/Contents/Resources; \ + $(INSTALL_DATA) $$game.app/Contents/Info.plist $(DESTDIR)/Applications/$$game.app/Contents; \ + $(INSTALL_DATA) $$game.app/Contents/PkgInfo $(DESTDIR)/Applications/$$game.app/Contents; \ + $(INSTALL_BIN) $$game.app/Contents/MacOS/$$game $(DESTDIR)/Applications/$$game.app/Contents/MacOS; \ + $(INSTALL_DATA) $$game.app/Contents/Resources/$$game.icns $(DESTDIR)/Applications/$$game.app/Contents/Resources; \ done uninstall: @@ -240,9 +242,9 @@ uninstall-linux: uninstall-osx: echo Removing games from $(DESTDIR)/Applications... - $(RM) -r $(DESTDIR)/Applications/blocks.app - $(RM) -r $(DESTDIR)/Applications/checkers.app - $(RM) -r $(DESTDIR)/Applications/sudoku.app + $(RMDIR) $(DESTDIR)/Applications/blocks.app + $(RMDIR) $(DESTDIR)/Applications/checkers.app + $(RMDIR) $(DESTDIR)/Applications/sudoku.app # FLUID file rules .fl.cxx .fl.h: ../fluid/fluid$(EXEEXT) @@ -275,20 +277,17 @@ blocks$(EXEEXT): blocks.o echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) blocks.o -o $@ $(AUDIOLIBS) $(LINKFLTK) $(LDLIBS) $(CP) blocks$(EXEEXT) blocks.app/Contents/MacOS - $(POSTBUILD) $@ ../FL/mac.r checkers$(EXEEXT): checkers.o echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS) $(CP) checkers$(EXEEXT) checkers.app/Contents/MacOS - $(POSTBUILD) $@ ../FL/mac.r clock$(EXEEXT): clock.o colbrowser$(EXEEXT): colbrowser.o echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS) - $(POSTBUILD) $@ ../FL/mac.r color_chooser$(EXEEXT): color_chooser.o @@ -299,14 +298,12 @@ curve$(EXEEXT): curve.o demo$(EXEEXT): demo.o echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS) - $(POSTBUILD) $@ ../FL/mac.r doublebuffer$(EXEEXT): doublebuffer.o editor$(EXEEXT): editor.o echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS) - $(POSTBUILD) $@ ../FL/mac.r fast_slow$(EXEEXT): fast_slow.o fast_slow.cxx: fast_slow.fl ../fluid/fluid$(EXEEXT) @@ -314,21 +311,18 @@ fast_slow.cxx: fast_slow.fl ../fluid/fluid$(EXEEXT) file_chooser$(EXEEXT): file_chooser.o ../lib/$(IMGLIBNAME) echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS) - $(POSTBUILD) $@ ../FL/mac.r fonts$(EXEEXT): fonts.o forms$(EXEEXT): forms.o echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ forms.o $(LINKFLTKFORMS) $(LDLIBS) - $(POSTBUILD) $@ ../FL/mac.r hello$(EXEEXT): hello.o help$(EXEEXT): help.o ../lib/$(IMGLIBNAME) echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS) - $(POSTBUILD) $@ ../FL/mac.r iconize$(EXEEXT): iconize.o @@ -344,14 +338,12 @@ input_choice$(EXEEXT): input_choice.o keyboard$(EXEEXT): keyboard_ui.o keyboard.o echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS) - $(POSTBUILD) $@ ../FL/mac.r keyboard_ui.o: keyboard_ui.h keyboard_ui.cxx: keyboard_ui.fl ../fluid/fluid$(EXEEXT) label$(EXEEXT): label.o echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS) - $(POSTBUILD) $@ ../FL/mac.r line_style$(EXEEXT): line_style.o @@ -360,7 +352,6 @@ list_visuals$(EXEEXT): list_visuals.o mandelbrot$(EXEEXT): mandelbrot_ui.o mandelbrot.o echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ mandelbrot.o mandelbrot_ui.o $(LINKFLTK) $(LDLIBS) - $(POSTBUILD) $@ ../FL/mac.r mandelbrot_ui.o: mandelbrot_ui.h mandelbrot_ui.cxx: mandelbrot_ui.fl ../fluid/fluid$(EXEEXT) @@ -375,7 +366,6 @@ navigation$(EXEEXT): navigation.o output$(EXEEXT): output.o ../lib/$(FLLIBNAME) echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS) - $(POSTBUILD) $@ ../FL/mac.r overlay$(EXEEXT): overlay.o @@ -386,7 +376,6 @@ pixmap$(EXEEXT): pixmap.o pixmap_browser$(EXEEXT): pixmap_browser.o ../lib/$(IMGLIBNAME) echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS) - $(POSTBUILD) $@ ../FL/mac.r preferences$(EXEEXT): preferences.o preferences.cxx: preferences.fl ../fluid/fluid$(EXEEXT) @@ -407,7 +396,6 @@ sudoku: sudoku.o echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS) $(CP) sudoku$(EXEEXT) sudoku.app/Contents/MacOS - $(POSTBUILD) $@ ../FL/mac.r sudoku.exe: sudoku.o sudoku.rc echo Linking $@... @@ -440,7 +428,6 @@ CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ \ CubeMain.o CubeView.o CubeViewUI.o \ $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) - $(POSTBUILD) $@ ../FL/mac.r CubeMain.o: CubeViewUI.h CubeView.h CubeViewUI.cxx CubeView.o: CubeView.h CubeViewUI.o: CubeViewUI.cxx CubeViewUI.h @@ -449,27 +436,21 @@ CubeViewUI.cxx: CubeViewUI.fl ../fluid/fluid$(EXEEXT) cube$(EXEEXT): cube.o echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ cube.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) - $(POSTBUILD) $@ ../FL/mac.r fractals$(EXEEXT): fractals.o fracviewer.o echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ fractals.o fracviewer.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) - $(POSTBUILD) $@ ../FL/mac.r fullscreen$(EXEEXT): fullscreen.o echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ fullscreen.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) - $(POSTBUILD) $@ ../FL/mac.r glpuzzle$(EXEEXT): glpuzzle.o echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ glpuzzle.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) - $(POSTBUILD) $@ ../FL/mac.r gl_overlay$(EXEEXT): gl_overlay.o echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ gl_overlay.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) - $(POSTBUILD) $@ ../FL/mac.r shape$(EXEEXT): shape.o echo Linking $@... $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ shape.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) - $(POSTBUILD) $@ ../FL/mac.r # diff --git a/zlib/Makefile b/zlib/Makefile index 919ef51aa..619535fac 100644 --- a/zlib/Makefile +++ b/zlib/Makefile @@ -3,7 +3,7 @@ # # GNU ZIP library makefile for the Fast Light Toolkit (FLTK). # -# Copyright 1997-2005 by Easy Software Products. +# Copyright 1997-2007 by Easy Software Products. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public @@ -58,13 +58,14 @@ clean: install: $(LIBZ) echo "Installing libfltk_z$(LIBEXT) in $(libdir)..." - -$(MKDIR) $(libdir) - $(RM) $(libdir)/libfltk_z$(LIBEXT) - $(CP) $(LIBZ) $(libdir) - $(RANLIB) $(libdir)/libfltk_z$(LIBEXT) + -$(INSTALL_DIR) $(DESTDIR)$(libdir) + $(INSTALL_LIB) libfltk_z$(LIBEXT) $(DESTDIR)$(libdir) + $(RANLIB) $(DESTDIR)$(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 + -$(INSTALL_DIR) $(DESTDIR)$(includedir)/FL/images + $(INSTALL_DATA) zconf.h $(DESTDIR)$(includedir)/FL/images + $(INSTALL_DATA) zlib.h $(DESTDIR)$(includedir)/FL/images + $(INSTALL_DATA) zutil.h $(DESTDIR)$(includedir)/FL/images # |