diff options
| -rw-r--r-- | FL/Makefile.in | 24 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | documentation/Makefile | 76 | ||||
| -rw-r--r-- | fltk-config.in | 48 | ||||
| -rw-r--r-- | fluid/Makefile | 48 | ||||
| -rw-r--r-- | jpeg/Makefile | 34 | ||||
| -rw-r--r-- | png/Makefile | 30 | ||||
| -rw-r--r-- | src/Makefile | 262 | ||||
| -rw-r--r-- | test/Makefile | 58 | ||||
| -rw-r--r-- | zlib/Makefile | 22 |
10 files changed, 305 insertions, 305 deletions
diff --git a/FL/Makefile.in b/FL/Makefile.in index 04a115c9d..f8d46ff78 100644 --- a/FL/Makefile.in +++ b/FL/Makefile.in @@ -24,24 +24,24 @@ depend: install: echo "Installing include files in $(DESTDIR)$(includedir)..." - $(RMDIR) $(DESTDIR)$(includedir)/FL - $(INSTALL_DIR) $(DESTDIR)$(includedir)/FL + $(RMDIR) "$(DESTDIR)$(includedir)/FL" + $(INSTALL_DIR) "$(DESTDIR)$(includedir)/FL" for file in *.[hH]; do \ - $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/FL; \ + $(INSTALL_DATA) $$file "$(DESTDIR)$(includedir)/FL"; \ done -@HLINKS@ cd $(DESTDIR)$(includedir)/FL;\ +@HLINKS@ cd "$(DESTDIR)$(includedir)/FL";\ @HLINKS@ for file in *.H; do\ @HLINKS@ $(RM) "`basename $$file H`h";\ @HLINKS@ $(LN) $$file "`basename $$file H`h";\ @HLINKS@ done -@HLINKS@ $(RM) $(DESTDIR)$(includedir)/FL/fl_file_chooser.H -@HLINKS@ $(LN) Fl_File_Chooser.H $(DESTDIR)$(includedir)/FL/fl_file_chooser.H -@HLINKS@ $(RM) $(DESTDIR)$(includedir)/FL/fl_file_chooser.h -@HLINKS@ $(LN) Fl_File_Chooser.H $(DESTDIR)$(includedir)/FL/fl_file_chooser.h -@HLINKS@ $(RM) $(DESTDIR)$(includedir)/Fl -@HLINKS@ $(LN) FL $(DESTDIR)$(includedir)/Fl +@HLINKS@ $(RM) "$(DESTDIR)$(includedir)/FL/fl_file_chooser.H" +@HLINKS@ $(LN) Fl_File_Chooser.H "$(DESTDIR)$(includedir)/FL/fl_file_chooser.H" +@HLINKS@ $(RM) "$(DESTDIR)$(includedir)/FL/fl_file_chooser.h" +@HLINKS@ $(LN) Fl_File_Chooser.H "$(DESTDIR)$(includedir)/FL/fl_file_chooser.h" +@HLINKS@ $(RM) "$(DESTDIR)$(includedir)/Fl" +@HLINKS@ $(LN) FL "$(DESTDIR)$(includedir)/Fl" uninstall: echo "Uninstalling include files..." - $(RMDIR) $(DESTDIR)$(includedir)/FL -@HLINKS@ $(RM) $(DESTDIR)$(includedir)/Fl + $(RMDIR) "$(DESTDIR)$(includedir)/FL" +@HLINKS@ $(RM) "$(DESTDIR)$(includedir)/Fl" @@ -31,9 +31,9 @@ test: all (cd test; $(MAKE) $(MFLAGS)) || exit 1 install: makeinclude - -mkdir -p $(DESTDIR)$(bindir) - $(RM) $(DESTDIR)$(bindir)/fltk-config - $(INSTALL_SCRIPT) fltk-config $(DESTDIR)$(bindir) + -mkdir -p "$(DESTDIR)$(bindir)" + $(RM) "$(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;\ @@ -46,7 +46,7 @@ install-desktop: makeinclude cd test; $(MAKE) $(MFLAGS) $(INSTALL_DESKTOP) uninstall: makeinclude - $(RM) $(DESTDIR)$(bindir)/fltk-config + $(RM) "$(DESTDIR)$(bindir)/fltk-config" for dir in FL $(DIRS); do\ echo "=== uninstalling $$dir ===";\ (cd $$dir; $(MAKE) $(MFLAGS) uninstall) || exit 1;\ diff --git a/documentation/Makefile b/documentation/Makefile index 6760e4622..a93345980 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -79,59 +79,59 @@ depend: install: $(MANPAGES) echo "Installing documentation files in $(DESTDIR)$(docdir) ..." - -$(INSTALL_DIR) $(DESTDIR)$(docdir) + -$(INSTALL_DIR) "$(DESTDIR)$(docdir)" if test -f html/index.html ; then \ for file in html/* ; do \ - $(INSTALL_DATA) $$file $(DESTDIR)$(docdir); \ + $(INSTALL_DATA) $$file "$(DESTDIR)$(docdir)"; \ done \ fi if test -f fltk.pdf ; then \ echo "Installing fltk.pdf in $(DESTDIR)$(docdir) ..."; \ - $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \ + $(INSTALL_DATA) fltk.pdf "$(DESTDIR)$(docdir)"; \ fi echo "Installing man pages in $(DESTDIR)$(mandir) ..." - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1 - $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-options.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3 - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3 - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 - $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1 - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1 - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-options.man $(DESTDIR)$(mandir)/man1/fltk-options.1 - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man3 - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3 + -$(INSTALL_DIR) "$(DESTDIR)$(mandir)/cat1" + $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) "$(DESTDIR)$(mandir)/cat1" + $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) "$(DESTDIR)$(mandir)/cat1" + $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-options.$(CAT1EXT) "$(DESTDIR)$(mandir)/cat1" + -$(INSTALL_DIR) "$(DESTDIR)$(mandir)/cat3" + $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) "$(DESTDIR)$(mandir)/cat3" + -$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" + $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man "$(DESTDIR)$(mandir)/man1/fluid.1" + $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man "$(DESTDIR)$(mandir)/man1/fltk-config.1" + $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-options.man "$(DESTDIR)$(mandir)/man1/fltk-options.1" + -$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man3" + $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man "$(DESTDIR)$(mandir)/man3/fltk.3" install-linux install-osx: - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6 - $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 - $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 - $(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6 - $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6 - $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6 - $(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.man $(DESTDIR)$(mandir)/man6/sudoku.6 + -$(INSTALL_DIR) "$(DESTDIR)$(mandir)/cat6" + $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) "$(DESTDIR)$(mandir)/cat6" + $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) "$(DESTDIR)$(mandir)/cat6" + $(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) "$(DESTDIR)$(mandir)/cat6" + -$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man6" + $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man "$(DESTDIR)$(mandir)/man6/blocks.6" + $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man "$(DESTDIR)$(mandir)/man6/checkers.6" + $(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.man "$(DESTDIR)$(mandir)/man6/sudoku.6" uninstall: - $(RMDIR) $(DESTDIR)$(docdir) - $(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT) - $(RM) $(DESTDIR)$(mandir)/man1/fluid.1 - $(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT) - $(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1 - $(RM) $(DESTDIR)$(mandir)/cat1/fltk-options.$(CAT1EXT) - $(RM) $(DESTDIR)$(mandir)/man1/fltk-options.1 - $(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT) - $(RM) $(DESTDIR)$(mandir)/man3/fltk.3 + $(RMDIR) "$(DESTDIR)$(docdir)" + $(RM) "$(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT)" + $(RM) "$(DESTDIR)$(mandir)/man1/fluid.1" + $(RM) "$(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT)" + $(RM) "$(DESTDIR)$(mandir)/man1/fltk-config.1" + $(RM) "$(DESTDIR)$(mandir)/cat1/fltk-options.$(CAT1EXT)" + $(RM) "$(DESTDIR)$(mandir)/man1/fltk-options.1" + $(RM) "$(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT)" + $(RM) "$(DESTDIR)$(mandir)/man3/fltk.3" uninstall-linux uninstall-osx: - $(RM) $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT) - $(RM) $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT) - $(RM) $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT) - $(RM) $(DESTDIR)$(mandir)/man6/blocks.6 - $(RM) $(DESTDIR)$(mandir)/man6/checkers.6 - $(RM) $(DESTDIR)$(mandir)/man6/sudoku.6 + $(RM) "$(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT)" + $(RM) "$(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT)" + $(RM) "$(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT)" + $(RM) "$(DESTDIR)$(mandir)/man6/blocks.6" + $(RM) "$(DESTDIR)$(mandir)/man6/checkers.6" + $(RM) "$(DESTDIR)$(mandir)/man6/sudoku.6" # The documentation is generated using doxygen. There are two control files # for doxygen: Doxyfile for html documentation and Doxybook for pdf docs. diff --git a/fltk-config.in b/fltk-config.in index 29dde790d..cf9bed738 100644 --- a/fltk-config.in +++ b/fltk-config.in @@ -2,7 +2,7 @@ # # FLTK configuration utility. # -# Copyright 2000-2023 by Bill Spitzak and others. +# Copyright 2000-2024 by Bill Spitzak and others. # Original version Copyright 2000 by James Dean Palmer # Adapted by Vincent Penne and Michael Sweet # @@ -72,25 +72,25 @@ GLLIBS="@GLLIBS@" # Check bundled image libraries in source tree if test -f "$libdir/libfltk_jpeg.a"; then - CFLAGS="-I$includedir/jpeg $CFLAGS" - CXXFLAGS="-I$includedir/jpeg $CXXFLAGS" + CFLAGS="-I'$includedir/jpeg' $CFLAGS" + CXXFLAGS="-I'$includedir/jpeg' $CXXFLAGS" fi if test -f "$libdir/libfltk_z.a"; then - CFLAGS="-I$includedir/zlib $CFLAGS" - CXXFLAGS="-I$includedir/zlib $CXXFLAGS" + CFLAGS="-I'$includedir/zlib' $CFLAGS" + CXXFLAGS="-I'$includedir/zlib' $CXXFLAGS" fi if test -f "$libdir/libfltk_png.a"; then - CFLAGS="-I$includedir/png $CFLAGS" - CXXFLAGS="-I$includedir/png $CXXFLAGS" + CFLAGS="-I'$includedir/png' $CFLAGS" + CXXFLAGS="-I'$includedir/png' $CXXFLAGS" fi # Check bundled image libraries in installation folder. # Note: jpeg, png, and zlib headers are installed in FL/images if test -d $includedir/FL/images; then - CFLAGS="-I$includedir/FL/images $CFLAGS" - CXXFLAGS="-I$includedir/FL/images $CXXFLAGS" + CFLAGS="-I'$includedir/FL/images' $CFLAGS" + CXXFLAGS="-I'$includedir/FL/images' $CXXFLAGS" fi # Cairo support @@ -254,39 +254,39 @@ do done if test "$includedir" != /usr/include; then - includes=-I$includedir + includes="-I'$includedir'" else includes= fi # prepend build directory for fltk-config in CMake build folder if test -n "$BINARY_DIR"; then - includes="-I$BINARY_DIR $includes" + includes="-I'$BINARY_DIR' $includes" fi if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32; then - libs=-L$libdir + libs="-L'$libdir'" else libs= fi # Calculate needed libraries -LDSTATIC="$libdir/libfltk.a $LDLIBS" +LDSTATIC="'$libdir/libfltk.a' $LDLIBS" LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS" if test x$use_forms = xyes; then LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS" - LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC" + LDSTATIC="'$libdir/libfltk_forms.a' $LDSTATIC" fi if test x$use_gl = xyes; then LDLIBS="-lfltk_gl$SHAREDSUFFIX $GLLIBS $LDLIBS" - LDSTATIC="$libdir/libfltk_gl.a $GLLIBS $LDSTATIC" + LDSTATIC="'$libdir/libfltk_gl.a' $GLLIBS $LDSTATIC" fi if test x$use_images = xyes; then LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS" - LDSTATIC="$libdir/libfltk_images.a $STATICIMAGELIBS $LDSTATIC" + LDSTATIC="'$libdir/libfltk_images.a' $STATICIMAGELIBS $LDSTATIC" fi if test x$use_cairo = xyes -a -n "$CAIROLIBS"; then @@ -392,10 +392,10 @@ fi if test "$echo_ldflags" = "yes"; then my_libs= - libdirs=$libs + libdirs="$libs" for i in $LDLIBS ; do - if test $i != -L$libdir ; then + if test $i != "-L'$libdir'" ; then if test -z "$my_libs" ; then my_libs="$i" else @@ -411,22 +411,22 @@ if test "$echo_ldstaticflags" = "yes"; then fi if test "$echo_libs" = "yes"; then - USELIBS="$libdir/libfltk.a" + USELIBS="'$libdir/libfltk.a'" if test x$use_forms = xyes; then - USELIBS="$libdir/libfltk_forms.a $USELIBS" + USELIBS="'$libdir/libfltk_forms.a' $USELIBS" fi if test x$use_gl = xyes; then - USELIBS="$libdir/libfltk_gl.a $USELIBS" + USELIBS="'$libdir/libfltk_gl.a' $USELIBS" fi if test x$use_images = xyes; then - USELIBS="$libdir/libfltk_images.a $USELIBS" + USELIBS="'$libdir/libfltk_images.a' $USELIBS" for lib in fltk_jpeg fltk_png fltk_z; do - if test -f $libdir/lib$lib.a; then - USELIBS="$libdir/lib$lib.a $USELIBS" + if test -f "$libdir/lib$lib.a"; then + USELIBS="'$libdir/lib$lib.a' $USELIBS" fi done fi diff --git a/fluid/Makefile b/fluid/Makefile index eb5b8c192..ae8037441 100644 --- a/fluid/Makefile +++ b/fluid/Makefile @@ -1,7 +1,7 @@ # # FLUID Makefile for the Fast Light Tool Kit (FLTK). # -# Copyright 1998-2023 by Bill Spitzak and others. +# Copyright 1998-2024 by Bill Spitzak and others. # # This library is free software. Distribution and use rights are outlined in # the file "COPYING" which should have been included with this file. If this @@ -97,45 +97,45 @@ include makedepend install: all echo "Installing FLUID in $(DESTDIR)$(bindir)..." - -$(INSTALL_DIR) $(DESTDIR)$(bindir) - $(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT) + -$(INSTALL_DIR) "$(DESTDIR)$(bindir)" + $(INSTALL_BIN) $(FLUID) "$(DESTDIR)$(bindir)/fluid$(EXEEXT)" install-linux: - -$(INSTALL_DIR) $(DESTDIR)/usr/share/applications - $(INSTALL_DATA) fluid.desktop $(DESTDIR)/usr/share/applications + -$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications" + $(INSTALL_DATA) fluid.desktop "$(DESTDIR)$(datadir)/applications" for size in 16 32 48 64 128; do \ - if test ! -d $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; then \ - $(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; \ + if test ! -d "$(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps"; then \ + $(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps"; \ fi; \ - $(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/fluid.png; \ + $(INSTALL_DATA) icons/fluid-$$size.png "$(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/fluid.png"; \ done - -$(INSTALL_DIR) $(DESTDIR)/usr/share/mimelnk/application - $(INSTALL_DATA) x-fluid.desktop $(DESTDIR)/usr/share/mimelnk/application + -$(INSTALL_DIR) "$(DESTDIR)$(datadir)/mimelnk/application" + $(INSTALL_DATA) x-fluid.desktop "$(DESTDIR)$(datadir)/mimelnk/application" install-osx: echo Installing Fluid in $(DESTDIR)/Applications... - -$(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_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 - -$(INSTALL_DIR) $(DESTDIR)/Applications/fluid.app/Contents/Resources - $(INSTALL_DATA) fluid.app/Contents/Resources/fluid.icns $(DESTDIR)/Applications/fluid.app/Contents/Resources + -$(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_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" + -$(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) + $(RM) "$(DESTDIR)$(bindir)/fluid$(EXEEXT)" uninstall-linux: - $(RM) $(DESTDIR)/usr/share/applications/fluid.desktop - $(RM) $(DESTDIR)/usr/share/icons/hicolor/*/fluid.png - $(RM) $(DESTDIR)/usr/share/mimelnk/application/x-fluid.desktop + $(RM) "$(DESTDIR)$(datadir)/applications/fluid.desktop" + $(RM) "$(DESTDIR)$(datadir)/icons/hicolor"/*/fluid.png + $(RM) "$(DESTDIR)$(datadir)/mimelnk/application/x-fluid.desktop" uninstall-osx: - $(RM) -r $(DESTDIR)/Applications/fluid.app + $(RM) -r "$(DESTDIR)/Applications/fluid.app" # Note: The rebuild target can only be used if you have the original .fl -# files. This is normally only used by the FLTK maintainers... +# files. This is normally only used by FLTK maintainers... # It *must* be executed *after* fluid has been built and # fluid must be rebuilt if any {.fl|.cxx|.h} files were changed. diff --git a/jpeg/Makefile b/jpeg/Makefile index c83b4bb7a..e90ede88f 100644 --- a/jpeg/Makefile +++ b/jpeg/Makefile @@ -4,7 +4,7 @@ # # JPEG library makefile for the Fast Light Toolkit (FLTK). # -# Copyright 1997-2023 by Bill Spitzak and others. +# Copyright 1997-2024 by Bill Spitzak and others. # # This library is free software. Distribution and use rights are outlined in # the file "COPYING" which should have been included with this file. If this @@ -93,16 +93,16 @@ clean: install: $(LIBJPEG) echo "Installing $(LIBJPEG) in $(libdir)..." - -$(INSTALL_DIR) $(DESTDIR)$(libdir) - $(INSTALL_LIB) $(LIBJPEG) $(DESTDIR)$(libdir) - $(RANLIB) $(DESTDIR)$(libdir)/libfltk_jpeg$(LIBEXT) + -$(INSTALL_DIR) "$(DESTDIR)$(libdir)" + $(INSTALL_LIB) $(LIBJPEG) "$(DESTDIR)$(libdir)" + $(RANLIB) "$(DESTDIR)$(libdir)/libfltk_jpeg$(LIBEXT)" echo "Installing jpeg headers in $(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 - $(INSTALL_DATA) fltk_jpeg_prefix.h $(DESTDIR)$(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" + $(INSTALL_DATA) fltk_jpeg_prefix.h "$(DESTDIR)$(includedir)/FL/images" # # Uninstall everything... @@ -110,13 +110,13 @@ install: $(LIBJPEG) uninstall: echo "Uninstalling libfltk_jpeg$(LIBEXT) in $(libdir)..." - $(RM) $(libdir)/libfltk_jpeg$(LIBEXT) + $(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 - $(RM) $(includedir)/FL/images/fltk_jpeg_prefix.h + $(RM) "$(includedir)/FL/images/jconfig.h" + $(RM) "$(includedir)/FL/images/jerror.h" + $(RM) "$(includedir)/FL/images/jmorecfg.h" + $(RM) "$(includedir)/FL/images/jpeglib.h" + $(RM) "$(includedir)/FL/images/fltk_jpeg_prefix.h" # # libfltk_jpeg.a @@ -132,7 +132,7 @@ $(LIBJPEG): $(OBJS) # Make dependencies... # -depend: $(OBJS:.o=.c) +depend: $(OBJS:.o=.c) makedepend -Y -I.. -f makedepend -w 20 $(OBJS:.o=.c) echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > makedepend.tmp echo "" >> makedepend.tmp diff --git a/png/Makefile b/png/Makefile index 7fd9a8765..53efddb8a 100644 --- a/png/Makefile +++ b/png/Makefile @@ -2,7 +2,7 @@ # PNG library Makefile for the Fast Light Toolkit (FLTK). # # Copyright 1997-2011 by Easy Software Products. -# Copyright 2012-2023 by Bill Spitzak and others. +# Copyright 2012-2024 by Bill Spitzak and others. # # This library is free software. Distribution and use rights are outlined in # the file "COPYING" which should have been included with this file. If this @@ -52,15 +52,15 @@ clean: install: $(LIBPNG) echo "Installing libfltk_png$(LIBEXT) in $(libdir)..." - -$(INSTALL_DIR) $(DESTDIR)$(libdir) - $(INSTALL_LIB) $(LIBPNG) $(DESTDIR)$(libdir) - $(RANLIB) $(DESTDIR)$(libdir)/libfltk_png$(LIBEXT) + -$(INSTALL_DIR) "$(DESTDIR)$(libdir)" + $(INSTALL_LIB) $(LIBPNG) "$(DESTDIR)$(libdir)" + $(RANLIB) "$(DESTDIR)$(libdir)/libfltk_png$(LIBEXT)" echo "Installing png headers in $(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 - $(INSTALL_DATA) pnglibconf.h $(DESTDIR)$(includedir)/FL/images - $(INSTALL_DATA) pngprefix.h $(DESTDIR)$(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" + $(INSTALL_DATA) pnglibconf.h "$(DESTDIR)$(includedir)/FL/images" + $(INSTALL_DATA) pngprefix.h "$(DESTDIR)$(includedir)/FL/images" # @@ -69,12 +69,12 @@ install: $(LIBPNG) uninstall: echo "Uninstalling libfltk_png$(LIBEXT) in $(libdir)..." - $(RM) $(DESTDIR)$(libdir)/libfltk_png$(LIBEXT) + $(RM) "$(DESTDIR)$(libdir)/libfltk_png$(LIBEXT)" echo "Uninstalling png headers in $(includedir)/FL/images..." - $(RM) $(DESTDIR)$(includedir)/FL/images/png.h - $(RM) $(DESTDIR)$(includedir)/FL/images/pngconf.h - $(RM) $(DESTDIR)$(includedir)/FL/images/pnglibconf.h - $(RM) $(DESTDIR)$(includedir)/FL/images/pngprefix.h + $(RM) "$(DESTDIR)$(includedir)/FL/images/png.h" + $(RM) "$(DESTDIR)$(includedir)/FL/images/pngconf.h" + $(RM) "$(DESTDIR)$(includedir)/FL/images/pnglibconf.h" + $(RM) "$(DESTDIR)$(includedir)/FL/images/pngprefix.h" # @@ -92,7 +92,7 @@ $(LIBPNG): $(OBJS) # Make dependencies... # -depend: $(OBJS:.o=.c) +depend: $(OBJS:.o=.c) makedepend -Y -I.. -f makedepend -w 20 $(OBJS:.o=.c) echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > makedepend.tmp echo "" >> makedepend.tmp diff --git a/src/Makefile b/src/Makefile index ff151ace5..2caf49923 100644 --- a/src/Makefile +++ b/src/Makefile @@ -853,248 +853,248 @@ install: $(LIBNAME) $(DSONAME) \ $(GLLIBNAME) $(GLDSONAME) \ $(IMGLIBNAME) $(IMGDSONAME) echo "Installing libraries in $(DESTDIR)$(libdir)..." - -$(INSTALL_DIR) $(DESTDIR)$(libdir) - -$(INSTALL_DIR) $(DESTDIR)$(bindir) - $(RM) $(DESTDIR)$(libdir)/$(LIBBASENAME) - $(INSTALL_LIB) $(LIBNAME) $(DESTDIR)$(libdir) - $(INSTALL_LIB) $(FLLIBNAME) $(DESTDIR)$(libdir) - $(INSTALL_LIB) $(IMGLIBNAME) $(DESTDIR)$(libdir) - $(RANLIB) $(DESTDIR)$(libdir)/$(LIBBASENAME) - $(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBBASENAME) + -$(INSTALL_DIR) "$(DESTDIR)$(libdir)" + -$(INSTALL_DIR) "$(DESTDIR)$(bindir)" + $(RM) "$(DESTDIR)$(libdir)/$(LIBBASENAME)" + $(INSTALL_LIB) $(LIBNAME) "$(DESTDIR)$(libdir)" + $(INSTALL_LIB) $(FLLIBNAME) "$(DESTDIR)$(libdir)" + $(INSTALL_LIB) $(IMGLIBNAME) "$(DESTDIR)$(libdir)" + $(RANLIB) "$(DESTDIR)$(libdir)/$(LIBBASENAME)" + $(RANLIB) "$(DESTDIR)$(libdir)/$(FLLIBBASENAME)" if test x$(GLLIBNAME) != x; then \ - $(INSTALL_LIB) $(GLLIBNAME) $(DESTDIR)$(libdir); \ - $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \ + $(INSTALL_LIB) $(GLLIBNAME) "$(DESTDIR)$(libdir)"; \ + $(RANLIB) "$(DESTDIR)$(libdir)/$(GLLIBBASENAME)"; \ fi - $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME) + $(RANLIB) "$(DESTDIR)$(libdir)/$(IMGLIBBASENAME)" if test x$(DSONAME) = xlibfltk.so.$(FL_DSO_VERSION); then\ - $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\ - $(INSTALL_LIB) libfltk.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \ - $(LN) libfltk.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk.so;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk.so*;\ + $(INSTALL_LIB) libfltk.so.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)"; \ + $(LN) libfltk.so.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)/libfltk.so";\ fi if test x$(DSONAME) = xlibfltk.sl.$(FL_DSO_VERSION); then\ - $(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\ - $(INSTALL_LIB) libfltk.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \ - $(LN) libfltk.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk.sl;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk.sl*;\ + $(INSTALL_LIB) libfltk.sl.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)"; \ + $(LN) libfltk.sl.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)/libfltk.sl";\ fi if test x$(DSONAME) = xlibfltk.$(FL_DSO_VERSION).dylib; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk.*dylib;\ - $(INSTALL_LIB) libfltk.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir); \ - $(LN) libfltk.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir)/libfltk.dylib;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk.*dylib;\ + $(INSTALL_LIB) libfltk.$(FL_DSO_VERSION).dylib "$(DESTDIR)$(libdir)"; \ + $(LN) libfltk.$(FL_DSO_VERSION).dylib "$(DESTDIR)$(libdir)/libfltk.dylib";\ fi if test x$(DSONAME) = xlibfltk_s.a; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\ - $(INSTALL_LIB) libfltk_s.a $(DESTDIR)$(libdir); \ + $(RM) "$(DESTDIR)$(libdir)/libfltk_s.a";\ + $(INSTALL_LIB) libfltk_s.a "$(DESTDIR)$(libdir)"; \ fi if test x$(DSONAME) = xcygfltknox-$(FL_DSO_VERSION).dll; then\ - $(RM) $(DESTDIR)$(bindir)/$(DSONAME);\ - $(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \ - $(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\ - $(INSTALL_LIB) libfltk.dll.a $(DESTDIR)$(libdir); \ + $(RM) "$(DESTDIR)$(bindir)/$(DSONAME)";\ + $(INSTALL_LIB) $(DSONAME) "$(DESTDIR)$(bindir)"; \ + $(RM) "$(DESTDIR)$(libdir)/libfltk.dll.a";\ + $(INSTALL_LIB) libfltk.dll.a "$(DESTDIR)$(libdir)"; \ fi if test x$(DSONAME) = xmgwfltknox-$(FL_DSO_VERSION).dll; then\ - $(RM) $(DESTDIR)$(bindir)/$(DSONAME);\ - $(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \ - $(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\ - $(INSTALL_LIB) libfltk.dll.a $(DESTDIR)$(libdir); \ + $(RM) "$(DESTDIR)$(bindir)/$(DSONAME)";\ + $(INSTALL_LIB) $(DSONAME) "$(DESTDIR)$(bindir)"; \ + $(RM) "$(DESTDIR)$(libdir)/libfltk.dll.a";\ + $(INSTALL_LIB) libfltk.dll.a "$(DESTDIR)$(libdir)"; \ fi if test x$(FLDSONAME) = xlibfltk_forms.so.$(FL_DSO_VERSION); then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\ - $(INSTALL_LIB) libfltk_forms.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \ - $(LN) libfltk_forms.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_forms.so;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk_forms.so*;\ + $(INSTALL_LIB) libfltk_forms.so.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)"; \ + $(LN) libfltk_forms.so.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)/libfltk_forms.so";\ fi if test x$(FLDSONAME) = xlibfltk_forms.sl.$(FL_DSO_VERSION); then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\ - $(INSTALL_LIB) libfltk_forms.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \ - $(LN) libfltk_forms.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_forms.sl;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk_forms.sl*;\ + $(INSTALL_LIB) libfltk_forms.sl.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)"; \ + $(LN) libfltk_forms.sl.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)/libfltk_forms.sl";\ fi if test x$(FLDSONAME) = xlibfltk_forms.$(FL_DSO_VERSION).dylib; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_forms.*dylib;\ - $(INSTALL_LIB) libfltk_forms.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir); \ - $(LN) libfltk_forms.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir)/libfltk_forms.dylib;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk_forms.*dylib;\ + $(INSTALL_LIB) libfltk_forms.$(FL_DSO_VERSION).dylib "$(DESTDIR)$(libdir)"; \ + $(LN) libfltk_forms.$(FL_DSO_VERSION).dylib "$(DESTDIR)$(libdir)/libfltk_forms.dylib";\ fi if test x$(FLDSONAME) = xlibfltk_forms_s.a; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_forms_s.a;\ - $(INSTALL_LIB) libfltk_forms_s.a $(DESTDIR)$(libdir); \ + $(RM) "$(DESTDIR)$(libdir)/libfltk_forms_s.a";\ + $(INSTALL_LIB) libfltk_forms_s.a "$(DESTDIR)$(libdir)"; \ fi if test x$(FLDSONAME) = xcygfltknox_forms-$(FL_DSO_VERSION).dll; then\ - $(RM) $(DESTDIR)$(bindir)/$(FLDSONAME);\ - $(INSTALL_LIB) $(FLDSONAME) $(DESTDIR)$(bindir); \ - $(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\ - $(INSTALL_LIB) libfltk_forms.dll.a $(DESTDIR)$(libdir); \ + $(RM) "$(DESTDIR)$(bindir)/$(FLDSONAME)";\ + $(INSTALL_LIB) $(FLDSONAME) "$(DESTDIR)$(bindir)"; \ + $(RM) "$(DESTDIR)$(libdir)/libfltk_forms.dll.a";\ + $(INSTALL_LIB) libfltk_forms.dll.a "$(DESTDIR)$(libdir)"; \ fi if test x$(FLDSONAME) = xmgwfltknox_forms-$(FL_DSO_VERSION).dll; then\ - $(RM) $(DESTDIR)$(bindir)/$(FLDSONAME);\ - $(INSTALL_LIB) $(FLDSONAME) $(DESTDIR)$(bindir); \ - $(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\ - $(INSTALL_LIB) libfltk_forms.dll.a $(DESTDIR)$(libdir); \ + $(RM) "$(DESTDIR)$(bindir)/$(FLDSONAME)";\ + $(INSTALL_LIB) $(FLDSONAME) "$(DESTDIR)$(bindir)"; \ + $(RM) "$(DESTDIR)$(libdir)/libfltk_forms.dll.a";\ + $(INSTALL_LIB) libfltk_forms.dll.a "$(DESTDIR)$(libdir)"; \ fi if test x$(GLDSONAME) = xlibfltk_gl.so.$(FL_DSO_VERSION); then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\ - $(INSTALL_LIB) libfltk_gl.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \ - $(LN) libfltk_gl.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_gl.so;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk_gl.so*;\ + $(INSTALL_LIB) libfltk_gl.so.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)"; \ + $(LN) libfltk_gl.so.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)/libfltk_gl.so";\ fi if test x$(GLDSONAME) = xlibfltk_gl.sl.$(FL_DSO_VERSION); then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\ - $(INSTALL_LIB) libfltk_gl.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \ - $(LN) libfltk_gl.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_gl.sl;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk_gl.sl*;\ + $(INSTALL_LIB) libfltk_gl.sl.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)"; \ + $(LN) libfltk_gl.sl.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)/libfltk_gl.sl";\ fi if test x$(GLDSONAME) = xlibfltk_gl.$(FL_DSO_VERSION).dylib; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_gl.*dylib;\ - $(INSTALL_LIB) libfltk_gl.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir); \ - $(LN) libfltk_gl.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir)/libfltk_gl.dylib;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk_gl.*dylib;\ + $(INSTALL_LIB) libfltk_gl.$(FL_DSO_VERSION).dylib "$(DESTDIR)$(libdir)"; \ + $(LN) libfltk_gl.$(FL_DSO_VERSION).dylib "$(DESTDIR)$(libdir)/libfltk_gl.dylib";\ fi if test x$(GLDSONAME) = xlibfltk_gl_s.a; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_gl_s.a;\ - $(INSTALL_LIB) libfltk_gl_s.a $(DESTDIR)$(libdir); \ + $(RM) "$(DESTDIR)$(libdir)/libfltk_gl_s.a";\ + $(INSTALL_LIB) libfltk_gl_s.a "$(DESTDIR)$(libdir)"; \ fi if test x$(GLDSONAME) = xcygfltknox_gl-$(FL_DSO_VERSION).dll; then\ - $(RM) $(DESTDIR)$(bindir)/$(GLDSONAME);\ - $(INSTALL_LIB) $(GLDSONAME) $(DESTDIR)$(bindir); \ - $(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\ - $(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \ + $(RM) "$(DESTDIR)$(bindir)/$(GLDSONAME)";\ + $(INSTALL_LIB) $(GLDSONAME) "$(DESTDIR)$(bindir)"; \ + $(RM) "$(DESTDIR)$(libdir)/libfltk_gl.dll.a";\ + $(INSTALL_LIB) libfltk_gl.dll.a "$(DESTDIR)$(libdir)"; \ fi if test x$(GLDSONAME) = xmgwfltknox_gl-$(FL_DSO_VERSION).dll; then\ - $(RM) $(DESTDIR)$(bindir)/$(GLDSONAME);\ - $(INSTALL_LIB) $(GLDSONAME) $(DESTDIR)$(bindir); \ - $(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\ - $(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \ + $(RM) "$(DESTDIR)$(bindir)/$(GLDSONAME)";\ + $(INSTALL_LIB) $(GLDSONAME) "$(DESTDIR)$(bindir)"; \ + $(RM) "$(DESTDIR)$(libdir)/libfltk_gl.dll.a";\ + $(INSTALL_LIB) libfltk_gl.dll.a "$(DESTDIR)$(libdir)"; \ fi if test x$(IMGDSONAME) = xlibfltk_images.so.$(FL_DSO_VERSION); then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\ - $(INSTALL_LIB) libfltk_images.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \ - $(LN) libfltk_images.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_images.so;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk_images.so*;\ + $(INSTALL_LIB) libfltk_images.so.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)"; \ + $(LN) libfltk_images.so.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)/libfltk_images.so";\ fi if test x$(IMGDSONAME) = xlibfltk_images.sl.$(FL_DSO_VERSION); then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\ - $(INSTALL_LIB) libfltk_images.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \ - $(LN) libfltk_images.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_images.sl;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk_images.sl*;\ + $(INSTALL_LIB) libfltk_images.sl.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)"; \ + $(LN) libfltk_images.sl.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)/libfltk_images.sl";\ fi if test x$(IMGDSONAME) = xlibfltk_images.$(FL_DSO_VERSION).dylib; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_images.*dylib;\ - $(INSTALL_LIB) libfltk_images.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir); \ - $(LN) libfltk_images.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir)/libfltk_images.dylib;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk_images.*dylib;\ + $(INSTALL_LIB) libfltk_images.$(FL_DSO_VERSION).dylib "$(DESTDIR)$(libdir)"; \ + $(LN) libfltk_images.$(FL_DSO_VERSION).dylib "$(DESTDIR)$(libdir)/libfltk_images.dylib";\ fi if test x$(IMGDSONAME) = xlibfltk_images_s.a; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_images_s.a;\ - $(INSTALL_LIB) libfltk_images_s.a $(DESTDIR)$(libdir); \ + $(RM) "$(DESTDIR)$(libdir)/libfltk_images_s.a";\ + $(INSTALL_LIB) libfltk_images_s.a "$(DESTDIR)$(libdir)"; \ fi if test x$(IMGDSONAME) = xcygfltknox_images-$(FL_DSO_VERSION).dll; then\ - $(RM) $(DESTDIR)$(bindir)/$(IMGDSONAME); \ - $(INSTALL_LIB) $(IMGDSONAME) $(DESTDIR)$(bindir); \ - $(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\ - $(INSTALL_LIB) libfltk_images.dll.a $(DESTDIR)$(libdir); \ + $(RM) "$(DESTDIR)$(bindir)/$(IMGDSONAME)"; \ + $(INSTALL_LIB) $(IMGDSONAME) "$(DESTDIR)$(bindir)"; \ + $(RM) "$(DESTDIR)$(libdir)/libfltk_images.dll.a";\ + $(INSTALL_LIB) libfltk_images.dll.a "$(DESTDIR)$(libdir)"; \ fi if test x$(IMGDSONAME) = xmgwfltknox_images-$(FL_DSO_VERSION).dll; then\ - $(RM) $(DESTDIR)$(bindir)/$(IMGDSONAME); \ - $(INSTALL_LIB) $(IMGDSONAME) $(DESTDIR)$(bindir); \ - $(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\ - $(INSTALL_LIB) libfltk_images.dll.a $(DESTDIR)$(libdir); \ + $(RM) "$(DESTDIR)$(bindir)/$(IMGDSONAME)"; \ + $(INSTALL_LIB) $(IMGDSONAME) "$(DESTDIR)$(bindir)"; \ + $(RM) "$(DESTDIR)$(libdir)/libfltk_images.dll.a";\ + $(INSTALL_LIB) libfltk_images.dll.a "$(DESTDIR)$(libdir)"; \ fi uninstall: echo "Uninstalling libraries..." - $(RM) $(DESTDIR)$(libdir)/$(LIBBASENAME) + $(RM) "$(DESTDIR)$(libdir)/$(LIBBASENAME)" if test x$(DSONAME) = xlibfltk.so.$(FL_DSO_VERSION); then\ - $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk.so*;\ fi if test x$(DSONAME) = xlibfltk.sl.$(FL_DSO_VERSION); then\ - $(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk.sl*;\ fi if test x$(DSONAME) = xlibfltk.$(FL_DSO_VERSION).dylib; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk.*dylib;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk.*dylib;\ fi if test x$(DSONAME) = xlibfltk_s.a; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\ + $(RM) "$(DESTDIR)$(libdir)/libfltk_s.a";\ fi if test x$(DSONAME) = xcygfltknox-$(FL_DSO_VERSION).dll; then\ - $(RM) $(DESTDIR)$(bindir)/$(DSONAME); \ - $(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\ + $(RM) "$(DESTDIR)$(bindir)/$(DSONAME)"; \ + $(RM) "$(DESTDIR)$(libdir)/libfltk.dll.a";\ fi if test x$(DSONAME) = xcygfltk-$(FL_DSO_VERSION).dll; then\ - $(RM) $(DESTDIR)$(bindir)/$(DSONAME); \ - $(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\ + $(RM) "$(DESTDIR)$(bindir)/$(DSONAME)"; \ + $(RM) "$(DESTDIR)$(libdir)/libfltk.dll.a";\ fi if test x$(DSONAME) = xmgwfltknox-$(FL_DSO_VERSION).dll; then\ - $(RM) $(DESTDIR)$(bindir)/$(DSONAME); \ - $(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\ + $(RM) "$(DESTDIR)$(bindir)/$(DSONAME)"; \ + $(RM) "$(DESTDIR)$(libdir)/libfltk.dll.a";\ fi - $(RM) $(DESTDIR)$(libdir)/$(FLLIBBASENAME); + $(RM) "$(DESTDIR)$(libdir)/$(FLLIBBASENAME)"; if test x$(FLDSONAME) = xlibfltk_forms.so.$(FL_DSO_VERSION); then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk_forms.so*;\ fi if test x$(FLDSONAME) = xlibfltk_forms.sl.$(FL_DSO_VERSION); then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk_forms.sl*;\ fi if test x$(FLDSONAME) = xlibfltk_forms.$(FL_DSO_VERSION).dylib; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_forms.*dylib;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk_forms.*dylib;\ fi if test x$(FLDSONAME) = xlibfltk_forms_s.a; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_forms_s.a;\ + $(RM) "$(DESTDIR)$(libdir)/libfltk_forms_s.a";\ fi if test x$(FLDSONAME) = xcygfltknox_forms-$(FL_DSO_VERSION).dll; then\ - $(RM) $(DESTDIR)$(bindir)/$(FLDSONAME); \ - $(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\ + $(RM) "$(DESTDIR)$(bindir)/$(FLDSONAME)"; \ + $(RM) "$(DESTDIR)$(libdir)/libfltk_forms.dll.a";\ fi if test x$(FLDSONAME) = xcygfltk_forms-$(FL_DSO_VERSION).dll; then\ - $(RM) $(DESTDIR)$(bindir)/$(FLDSONAME); \ - $(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\ + $(RM) "$(DESTDIR)$(bindir)/$(FLDSONAME)"; \ + $(RM) "$(DESTDIR)$(libdir)/libfltk_forms.dll.a";\ fi if test x$(FLDSONAME) = xmgwfltknox_forms-$(FL_DSO_VERSION).dll; then\ - $(RM) $(DESTDIR)$(bindir)/$(FLDSONAME); \ - $(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\ + $(RM) "$(DESTDIR)$(bindir)/$(FLDSONAME)"; \ + $(RM) "$(DESTDIR)$(libdir)/libfltk_forms.dll.a";\ fi if test x$(GLLIBNAME) != x; then\ - $(RM) $(DESTDIR)$(libdir)/$(GLLIBBASENAME);\ + $(RM) "$(DESTDIR)$(libdir)/$(GLLIBBASENAME)";\ fi if test x$(GLDSONAME) = xlibfltk_gl.so.$(FL_DSO_VERSION); then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk_gl.so*;\ fi if test x$(GLDSONAME) = xlibfltk_gl.sl.$(FL_DSO_VERSION); then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk_gl.sl*;\ fi if test x$(GLDSONAME) = xlibfltk_gl.$(FL_DSO_VERSION).dylib; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_gl.*dylib;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk_gl.*dylib;\ fi if test x$(GLDSONAME) = xlibfltk_gl_s.a; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_gl_s.a;\ + $(RM) "$(DESTDIR)$(libdir)/libfltk_gl_s.a";\ fi if test x$(GLDSONAME) = xcygfltknox_gl-$(FL_DSO_VERSION).dll; then\ - $(RM) $(DESTDIR)$(bindir)/$(GLDSONAME); \ - $(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\ + $(RM) "$(DESTDIR)$(bindir)/$(GLDSONAME)"; \ + $(RM) "$(DESTDIR)$(libdir)/libfltk_gl.dll.a";\ fi if test x$(GLDSONAME) = xcygfltk_gl-$(FL_DSO_VERSION).dll; then\ - $(RM) $(DESTDIR)$(bindir)/$(GLDSONAME); \ - $(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\ + $(RM) "$(DESTDIR)$(bindir)/$(GLDSONAME)"; \ + $(RM) "$(DESTDIR)$(libdir)/libfltk_gl.dll.a";\ fi if test x$(GLDSONAME) = xmgwfltknox_gl-$(FL_DSO_VERSION).dll; then\ - $(RM) $(DESTDIR)$(bindir)/$(GLDSONAME); \ - $(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\ + $(RM) "$(DESTDIR)$(bindir)/$(GLDSONAME)"; \ + $(RM) "$(DESTDIR)$(libdir)/libfltk_gl.dll.a";\ fi if test x$(IMGLIBNAME) != x; then\ - $(RM) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME);\ + $(RM) "$(DESTDIR)$(libdir)/$(IMGLIBBASENAME)";\ fi if test x$(IMGDSONAME) = xlibfltk_images.so.$(FL_DSO_VERSION); then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk_images.so*;\ fi if test x$(IMGDSONAME) = xlibfltk_images.sl.$(FL_DSO_VERSION); then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk_images.sl*;\ fi if test x$(IMGDSONAME) = xlibfltk_images.$(FL_DSO_VERSION).dylib; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_images.*dylib;\ + $(RM) "$(DESTDIR)$(libdir)"/libfltk_images.*dylib;\ fi if test x$(IMGDSONAME) = xlibfltk_images_s.a; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_images_s.a;\ + $(RM) "$(DESTDIR)$(libdir)/libfltk_images_s.a";\ fi if test x$(IMGDSONAME) = xcygfltknox_images-$(FL_DSO_VERSION).dll; then\ - $(RM) $(DESTDIR)$(bindir)/$(IMGDSONAME); \ - $(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\ + $(RM) "$(DESTDIR)$(bindir)/$(IMGDSONAME)"; \ + $(RM) "$(DESTDIR)$(libdir)/libfltk_images.dll.a";\ fi if test x$(IMGDSONAME) = xcygfltk_images-$(FL_DSO_VERSION).dll; then\ - $(RM) $(DESTDIR)$(bindir)/$(IMGDSONAME); \ - $(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\ + $(RM) "$(DESTDIR)$(bindir)/$(IMGDSONAME)"; \ + $(RM) "$(DESTDIR)$(libdir)/libfltk_images.dll.a";\ fi if test x$(IMGDSONAME) = xmgwfltknox_images-$(FL_DSO_VERSION).dll; then\ - $(RM) $(DESTDIR)$(bindir)/$(IMGDSONAME); \ - $(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\ + $(RM) "$(DESTDIR)$(bindir)/$(IMGDSONAME)"; \ + $(RM) "$(DESTDIR)$(libdir)/libfltk_images.dll.a";\ fi diff --git a/test/Makefile b/test/Makefile index c6401b262..05fdf54ee 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,5 +1,5 @@ # -# Test/example program Makefile for the Fast Light Tool Kit (FLTK). +# Test/demo program Makefile for the Fast Light Tool Kit (FLTK). # # Copyright 1998-2024 by Bill Spitzak and others. # @@ -282,60 +282,60 @@ clean: install: all echo "Installing example programs to $(DESTDIR)$(docdir)/examples..." - -$(INSTALL_DIR) $(DESTDIR)$(docdir)/examples + -$(INSTALL_DIR) "$(DESTDIR)$(docdir)/examples" for file in *.h *.cxx *.fl demo.menu; do \ - $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/examples; \ + $(INSTALL_DATA) $$file "$(DESTDIR)$(docdir)/examples"; \ done - -$(INSTALL_DIR) $(DESTDIR)$(docdir)/examples/pixmaps + -$(INSTALL_DIR) "$(DESTDIR)$(docdir)/examples/pixmaps" for file in pixmaps/*.xbm pixmaps/*.xpm; do \ - $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/examples/pixmaps; \ + $(INSTALL_DATA) $$file "$(DESTDIR)$(docdir)/examples/pixmaps"; \ done install-linux: echo Installing games to $(DESTDIR)$(bindir)... - -$(INSTALL_DIR) $(DESTDIR)$(bindir) - -$(INSTALL_DIR) $(DESTDIR)/usr/share/applications - -$(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/32x32/apps - -$(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/128x128/apps + -$(INSTALL_DIR) "$(DESTDIR)$(bindir)" + -$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications" + -$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps" + -$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps" for game in blocks checkers sudoku; do \ - $(INSTALL_BIN) $$game $(DESTDIR)$(bindir); \ - $(INSTALL_DATA) desktop/$$game.desktop $(DESTDIR)/usr/share/applications; \ - $(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; \ + $(INSTALL_BIN) $$game "$(DESTDIR)$(bindir)"; \ + $(INSTALL_DATA) desktop/$$game.desktop "$(DESTDIR)$(datadir)/applications"; \ + $(INSTALL_DATA) desktop/$$game-32.png "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/$$game.png"; \ + $(INSTALL_DATA) desktop/$$game-128.png "$(DESTDIR)$(datadir)/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 \ - $(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; \ + if test ! -d "$(DESTDIR)/Applications/$$game.app"; then \ + $(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; \ - $(INSTALL_DATA) $$game.app/Contents/Info.plist $(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; \ + $(INSTALL_DATA) $$game.app/Contents/Info.plist "$(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: echo "Removing examples programs from $(DESTDIR)$(docdir)/examples..." - -$(RMDIR) $(DESTDIR)$(docdir)/examples + -$(RMDIR) "$(DESTDIR)$(docdir)/examples" uninstall-linux: echo Removing games from $(DESTDIR)$(bindir)... for game in blocks checkers sudoku; do \ - $(RM) $(DESTDIR)$(bindir)/$$game; \ - $(RM) $(DESTDIR)/usr/share/applications/$$game.desktop; \ - $(RM) $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/$$game.png; \ - $(RM) $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/$$game.png; \ + $(RM) "$(DESTDIR)$(bindir)/$$game"; \ + $(RM) "$(DESTDIR)$(datadir)/applications/$$game.desktop"; \ + $(RM) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/$$game.png"; \ + $(RM) "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/$$game.png"; \ done uninstall-osx: echo Removing games from $(DESTDIR)/Applications... - $(RMDIR) $(DESTDIR)/Applications/blocks.app - $(RMDIR) $(DESTDIR)/Applications/checkers.app - $(RMDIR) $(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: diff --git a/zlib/Makefile b/zlib/Makefile index 67fcdd801..dea62afee 100644 --- a/zlib/Makefile +++ b/zlib/Makefile @@ -46,14 +46,14 @@ clean: install: $(LIBZ) echo "Installing libfltk_z$(LIBEXT) in $(libdir)..." - -$(INSTALL_DIR) $(DESTDIR)$(libdir) - $(INSTALL_LIB) $(LIBZ) $(DESTDIR)$(libdir) - $(RANLIB) $(DESTDIR)$(libdir)/libfltk_z$(LIBEXT) + -$(INSTALL_DIR) "$(DESTDIR)$(libdir)" + $(INSTALL_LIB) $(LIBZ) "$(DESTDIR)$(libdir)" + $(RANLIB) "$(DESTDIR)$(libdir)/libfltk_z$(LIBEXT)" echo "Installing zlib headers in $(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 + -$(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" # # Uninstall everything... @@ -61,11 +61,11 @@ install: $(LIBZ) uninstall: echo "Uninstalling libfltk_z$(LIBEXT) in $(libdir)..." - $(RM) $(libdir)/libfltk_z$(LIBEXT) + $(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 + $(RM) "$(includedir)/FL/images/zconf.h" + $(RM) "$(includedir)/FL/images/zlib.h" + $(RM) "$(includedir)/FL/images/zutil.h" # # libfltk_z.a |