fltk14-devel: Update to Git commit c380a91361db381747339a02e808e1b6850f7ce2

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: fltk14-devel: Update to Git commit c380a91361db381747339a02e808e1b6850f7ce2
From: Michael Baeuerle <micha%NetBSD.org@localhost>
Date: Thu, 16 Jul 2020 12:19:22 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Thu Jul 16 14:19:22 2020 +0200
Changeset:	5d29f219ce0380c4aaa90790aff294b5c6b465ea

Modified Files:
	fltk14-devel/Makefile
	fltk14-devel/PLIST
	fltk14-devel/buildlink3.mk
	fltk14-devel/distinfo
	fltk14-devel/options.mk
	fltk14-devel/patches/patch-configure.ac
	fltk14-devel/patches/patch-makeinclude.in
	fltk14-devel/patches/patch-test_Makefile

Log Message:
fltk14-devel: Update to Git commit c380a91361db381747339a02e808e1b6850f7ce2

- Updated PLIST
- bl3: Use different syntax as suggested by pkglint
- patches: Reworked for new version
          pkg-config patch for pango removed (now supported by upstream)
- Fixed some indentation errors (found by pkglint)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5d29f219ce0380c4aaa90790aff294b5c6b465ea

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 fltk14-devel/Makefile                     |  4 +-
 fltk14-devel/PLIST                        |  2 +
 fltk14-devel/buildlink3.mk                | 30 +++++-----
 fltk14-devel/distinfo                     | 14 ++---
 fltk14-devel/options.mk                   | 10 ++--
 fltk14-devel/patches/patch-configure.ac   | 94 ++-----------------------------
 fltk14-devel/patches/patch-makeinclude.in |  6 +-
 fltk14-devel/patches/patch-test_Makefile  | 51 ++++++++---------
 8 files changed, 62 insertions(+), 149 deletions(-)

diffs:
diff --git a/fltk14-devel/Makefile b/fltk14-devel/Makefile
index dd6e300618..9dbc2bf55e 100644
--- a/fltk14-devel/Makefile
+++ b/fltk14-devel/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=	fltk-1.4.x
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=fltk/}
-GITHUB_TAG=	940b7ba13d26dcde4fbd4574d56167501e598327
+GITHUB_TAG=	c380a91361db381747339a02e808e1b6850f7ce2
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	micha%NetBSD.org@localhost
@@ -13,7 +13,7 @@ LICENSE=	gnu-lgpl-v2
 
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
-USE_TOOLS+=		autoconf gmake nroff
+USE_TOOLS+=		autoconf gmake nroff pkg-config
 # Doesn't run tests, only build them (because they are GUI programs)
 TEST_TARGET=		test
 
diff --git a/fltk14-devel/PLIST b/fltk14-devel/PLIST
index f247ec2f90..40e9289a20 100644
--- a/fltk14-devel/PLIST
+++ b/fltk14-devel/PLIST
@@ -179,6 +179,8 @@ include/FL/Fl_Round_Button.H
 ${PLIST.cs}include/FL/Fl_Round_Button.h
 include/FL/Fl_Round_Clock.H
 ${PLIST.cs}include/FL/Fl_Round_Clock.h
+include/FL/Fl_SVG_File_Surface.H
+${PLIST.cs}include/FL/Fl_SVG_File_Surface.h
 include/FL/Fl_SVG_Image.H
 ${PLIST.cs}include/FL/Fl_SVG_Image.h
 include/FL/Fl_Scroll.H
diff --git a/fltk14-devel/buildlink3.mk b/fltk14-devel/buildlink3.mk
index 682e489f48..fc509f9d67 100644
--- a/fltk14-devel/buildlink3.mk
+++ b/fltk14-devel/buildlink3.mk
@@ -15,22 +15,22 @@ pkgbase := fltk
 .include "../../mk/pkg-build-options.mk"
 
 # For "opengl" option
-.if !empty(PKG_BUILD_OPTIONS.fltk:Mopengl)
-.  if !empty(PKG_BUILD_OPTIONS.fltk:Mx11)
-.     include "../../graphics/MesaLib/buildlink3.mk"
-.     include "../../graphics/glu/buildlink3.mk"
+.if ${PKG_BUILD_OPTIONS.fltk:Mopengl}
+.  if ${PKG_BUILD_OPTIONS.fltk:Mx11}
+.    include "../../graphics/MesaLib/buildlink3.mk"
+.    include "../../graphics/glu/buildlink3.mk"
 .  endif
 .endif
 
 # For "pango" option
-.if !empty(PKG_BUILD_OPTIONS.fltk:Mpango)
-.  if !empty(PKG_BUILD_OPTIONS.fltk:Mx11)
-.     include "../../devel/pango/buildlink3.mk"
+.if ${PKG_BUILD_OPTIONS.fltk:Mpango}
+.  if ${PKG_BUILD_OPTIONS.fltk:Mx11}
+.    include "../../devel/pango/buildlink3.mk"
 .  endif
 .endif
 
 # For "x11" option
-.if !empty(PKG_BUILD_OPTIONS.fltk:Mx11)
+.if ${PKG_BUILD_OPTIONS.fltk:Mx11}
 .  include "../../x11/libX11/buildlink3.mk"
 .  include "../../x11/libXcursor/buildlink3.mk"
 .  include "../../x11/libXext/buildlink3.mk"
@@ -39,21 +39,21 @@ pkgbase := fltk
 .endif
 
 # For "xdbe" option
-.if !empty(PKG_BUILD_OPTIONS.fltk:Mxdbe)
+.if ${PKG_BUILD_OPTIONS.fltk:Mxdbe}
 # No client library required
 .endif
 
 # For "xft2" option
-.if !empty(PKG_BUILD_OPTIONS.fltk:Mxft2)
-.  if !empty(PKG_BUILD_OPTIONS.fltk:Mx11)
-.     include "../../x11/libXft/buildlink3.mk"
+.if ${PKG_BUILD_OPTIONS.fltk:Mxft2}
+.  if ${PKG_BUILD_OPTIONS.fltk:Mx11}
+.    include "../../x11/libXft/buildlink3.mk"
 .  endif
 .endif
 
 # For "xinerama" option
-.if !empty(PKG_BUILD_OPTIONS.fltk:Mxinerama)
-.  if !empty(PKG_BUILD_OPTIONS.fltk:Mx11)
-.     include "../../x11/libXinerama/buildlink3.mk"
+.if ${PKG_BUILD_OPTIONS.fltk:Mxinerama}
+.  if ${PKG_BUILD_OPTIONS.fltk:Mx11}
+.    include "../../x11/libXinerama/buildlink3.mk"
 .  endif
 .endif
 
diff --git a/fltk14-devel/distinfo b/fltk14-devel/distinfo
index ee50b650aa..d45f77ff2a 100644
--- a/fltk14-devel/distinfo
+++ b/fltk14-devel/distinfo
@@ -1,13 +1,13 @@
 $NetBSD$
 
-SHA1 (fltk-1.4.x-940b7ba13d26dcde4fbd4574d56167501e598327.zip) = a31bac4f6cc3f453d221ccaba95f31eab78a33dd
-RMD160 (fltk-1.4.x-940b7ba13d26dcde4fbd4574d56167501e598327.zip) = 736dfdbba96d8b121a0b8929a943f149c1005393
-SHA512 (fltk-1.4.x-940b7ba13d26dcde4fbd4574d56167501e598327.zip) = 9f7aa0fe4ee515b0bb0d3d7a70d9823b235b53f8ccf98c243522e7e6bdf4f155564e0a611df19dc40d872dc8fe292d4e71435c66e16b6cfb984ad3c3467c39c8
-Size (fltk-1.4.x-940b7ba13d26dcde4fbd4574d56167501e598327.zip) = 6722087 bytes
+SHA1 (fltk-1.4.x-c380a91361db381747339a02e808e1b6850f7ce2.zip) = b36050c9b14761fdc3077cffc11b429e6ff9a9f3
+RMD160 (fltk-1.4.x-c380a91361db381747339a02e808e1b6850f7ce2.zip) = e7514b640d1b565c174f011ccd12a1f1069aae36
+SHA512 (fltk-1.4.x-c380a91361db381747339a02e808e1b6850f7ce2.zip) = 1f11b63f23e14c214394c53d2882b4861da134672c83c28e93d339bbf29c0a6c2b12c4302d1485025090250f2f15ea83902b03dd0a54638fbc57681c6ddb7ad2
+Size (fltk-1.4.x-c380a91361db381747339a02e808e1b6850f7ce2.zip) = 6852673 bytes
 SHA1 (patch-Makefile) = b6f6fee9f7d164f568bfcc7f7c119324052c4e1b
-SHA1 (patch-configure.ac) = d4bfad45fefa60ce6a62ba2c429ac8c1f1552397
+SHA1 (patch-configure.ac) = a8d3bbf1d08d8192d7707ae32deed9aee70a6f3c
 SHA1 (patch-documentation_Makefile) = ce2872dae289672a8bc603e1c10225df8d06f126
 SHA1 (patch-fluid_Makefile) = 8a727140bbcea9ca3bd8ce16ec3cb9b37cef3bb4
-SHA1 (patch-makeinclude.in) = b79a32c2d7571f79078f8ec6036a0e41604f6fac
+SHA1 (patch-makeinclude.in) = 3c7879c1a80ed0c48d7ca43e0af2827fbd70a508
 SHA1 (patch-src_Makefile) = 33923c156f8cb589868578217c96c035847aa9d5
-SHA1 (patch-test_Makefile) = 4f6da5c42db6c06703b72522551172fb873efb01
+SHA1 (patch-test_Makefile) = 49b018196b80beb7b3795053cd25687f845fec1c
diff --git a/fltk14-devel/options.mk b/fltk14-devel/options.mk
index a4071b4cfb..e8b8cc4bc0 100644
--- a/fltk14-devel/options.mk
+++ b/fltk14-devel/options.mk
@@ -21,8 +21,8 @@ PLIST_VARS+=		opengl
 # Attention: Some packages that use FLTK need this option (disable with care)
 .if !empty(PKG_OPTIONS:Mopengl)
 .  if !empty(PKG_OPTIONS:Mx11)
-.     include "../../graphics/MesaLib/buildlink3.mk"
-.     include "../../graphics/glu/buildlink3.mk"
+.    include "../../graphics/MesaLib/buildlink3.mk"
+.    include "../../graphics/glu/buildlink3.mk"
 .  endif
 CONFIGURE_ARGS+=	--enable-gl
 PLIST.opengl=		yes
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+=	--disable-gl
 PKG_FAIL_REASON+=	"pango option requires xft2 option."
 .  endif
 .  if !empty(PKG_OPTIONS:Mx11)
-.     include "../../devel/pango/buildlink3.mk"
+.    include "../../devel/pango/buildlink3.mk"
 .  endif
 CONFIGURE_ARGS+=	--enable-pango
 .else
@@ -80,7 +80,7 @@ CONFIGURE_ARGS+=	--disable-xdbe
 # Attention: X servers may be misconfigured for core fonts (disable with care).
 .if !empty(PKG_OPTIONS:Mxft2)
 .  if !empty(PKG_OPTIONS:Mx11)
-.     include "../../x11/libXft/buildlink3.mk"
+.    include "../../x11/libXft/buildlink3.mk"
 .  endif
 CONFIGURE_ARGS+=	--enable-xft
 .else
@@ -91,7 +91,7 @@ CONFIGURE_ARGS+=	--disable-xft
 # Enables support for two or more physical displays.
 .if !empty(PKG_OPTIONS:Mxinerama)
 .  if !empty(PKG_OPTIONS:Mx11)
-.     include "../../x11/libXinerama/buildlink3.mk"
+.    include "../../x11/libXinerama/buildlink3.mk"
 .  endif
 CONFIGURE_ARGS+=	--enable-xinerama
 .else
diff --git a/fltk14-devel/patches/patch-configure.ac b/fltk14-devel/patches/patch-configure.ac
index 72dbc6ad7c..8f05229a91 100644
--- a/fltk14-devel/patches/patch-configure.ac
+++ b/fltk14-devel/patches/patch-configure.ac
@@ -6,9 +6,9 @@ Remove OS specific CXXFLAGS and PANGOLIBDIR selection
 (tested to fail on GNU/Linux).
 Use pkg-config for Pango Flags/Libs instead.
 
---- configure.ac.orig	2019-09-24 10:57:29.000000000 +0000
+--- configure.ac.orig	2020-07-16 10:25:51.000000000 +0000
 +++ configure.ac
-@@ -217,7 +217,21 @@ fi
+@@ -223,7 +223,21 @@ fi
  AC_ARG_ENABLE(gl, [  --enable-gl             turn on OpenGL support [[default=yes]]])
  
  AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries [[default=no]]])
@@ -31,8 +31,8 @@ Use pkg-config for Pango Flags/Libs instead.
      PICFLAG=1
      SHAREDSUFFIX=""
      FLUID="fluid-shared"
-@@ -390,6 +404,21 @@ else
-     LINKSHARED="$LINKFLTKCAIRO ../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a"
+@@ -406,6 +420,21 @@ else
+   FLUID_BUILD="../fluid/fluid$EXEEXT"
  fi
  
 +if test "x$LIBTOOL" != "x"; then
@@ -53,89 +53,3 @@ Use pkg-config for Pango Flags/Libs instead.
  AC_SUBST(DSOCOMMAND)
  AC_SUBST(DSOFLAGS)
  AC_SUBST(DSOLINK)
-@@ -1087,33 +1116,58 @@ case $host_os_gui in
- 
-         pango_found=no
- 	if test x$enable_pango = xyes; then
--	    case $host_os in
--    		darwin*)
--	    	  CXXFLAGS="-I/sw/include/pango-1.0 -I/sw/include/glib-2.0 -I/sw/lib/glib-2.0/include $CXXFLAGS"
--	    	  PANGOLIBDIR="-L/sw/lib"
--	    	  ;;
--    		linux*)
--	    	  CXXFLAGS="-I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include $CXXFLAGS"
--	    	  CXXFLAGS="-I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/glib-2.0/include $CXXFLAGS"
--    	    	  ;;
--    	    	freebsd*)
--	    	  CXXFLAGS="-I/usr/local/include/pango-1.0 -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include $CXXFLAGS"
--	    	  ;;
--     	    	netbsd*)
--	    	  CXXFLAGS="-I/usr/pkg/include/pango-1.0 -I/usr/pkg/include/glib-2.0 -I/usr/pkg/lib/glib-2.0/include $CXXFLAGS"
--	    	  CXXFLAGS="-I/usr/pkg/include/glib/glib-2.0 $CXXFLAGS"
--	    	  PANGOLIBDIR="-L/usr/pkg/lib"
--	    	  LDFLAGS="-Wl,-rpath,/usr/pkg/lib $LDFLAGS"
--	    	  ;;
--   	    esac
--	        CPPFLAGS="$PANGOLIBDIR $CXXFLAGS"
--	        AC_CHECK_HEADERS([pango/pango.h pango/pangoxft.h],
--		   AC_CHECK_LIB(pango-1.0, pango_layout_new,
--		    AC_CHECK_LIB(pangoxft-1.0, pango_xft_render_layout,
--			AC_DEFINE(USE_PANGO)
--                        pango_found=yes
--			LIBS="$PANGOLIBDIR -lpango-1.0 -lpangoxft-1.0 -lgobject-2.0 $LIBS")))
--		CPPFLAGS=$CXXFLAGS
-+	dnl # Remove OS specific CXXFLAGS and PANGOLIBDIR selection for pkgsrc
-+	dnl # Use ${prefix} instead of hard coded locations
-+	dnl     case $host_os in
-+	dnl 	darwin*)
-+	dnl     	  CXXFLAGS="-I/sw/include/pango-1.0 -I/sw/include/glib-2.0 -I/sw/lib/glib-2.0/include $CXXFLAGS"
-+	dnl     	  PANGOLIBDIR="-L/sw/lib"
-+	dnl     	  ;;
-+	dnl 	linux*)
-+	dnl     	  CXXFLAGS="-I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include $CXXFLAGS"
-+	dnl     	  CXXFLAGS="-I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/glib-2.0/include $CXXFLAGS"
-+	dnl     	  ;;
-+	dnl     	freebsd*)
-+	dnl     	  CXXFLAGS="-I/usr/local/include/pango-1.0 -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include $CXXFLAGS"
-+	dnl     	  ;;
-+	dnl     	netbsd*)
-+	dnl     	  CXXFLAGS="-I$prefix/include/pango-1.0 -I$prefix/include/glib-2.0 -I$prefix/lib/glib-2.0/include $CXXFLAGS"
-+	dnl     	  CXXFLAGS="-I$prefix/include/glib/glib-2.0 $CXXFLAGS"
-+	dnl     	  PANGOLIBDIR="-L$prefix/lib"
-+	dnl     	  LDFLAGS="-Wl,-rpath,$prefix/lib $LDFLAGS"
-+	dnl     	  ;;
-+	dnl     esac
-+	dnl        CPPFLAGS="$PANGOLIBDIR $CXXFLAGS"
-+		dnl -------------------------------------------------------------
-+		dnl Use pkg-config instead for pkgsrc
-+		AC_PATH_PROG(PKGCONFIG, pkg-config)
-+		if test "x$PKGCONFIG" = x; then
-+			AC_MSG_NOTICE([please install pkg-config or use 'configure --disable-pango'.])
-+			AC_MSG_ERROR([Aborting.])
-+                fi
-+
-+		TMP="`$PKGCONFIG --cflags-only-I pangoxft`"
-+		if test "x$TMP" = x; then
-+			AC_MSG_NOTICE([pkg-config failed for pango, consider use of 'configure --disable-pango'.])
-+			AC_MSG_ERROR([Aborting.])
-+		fi
-+		CPPFLAGS="$TMP $CPPFLAGS"
-+
-+		TMP="`$PKGCONFIG --cflags-only-other pangoxft`"
-+		CXXFLAGS="$TMP $CXXFLAGS"
-+
-+		TMP="`$PKGCONFIG --libs-only-L pangoxft`"
-+		LDFLAGS="$TMP $LDFLAGS"
-+
-+		TMP="`$PKGCONFIG --libs-only-l pangoxft`"
-+		LIBS="$TMP $LIBS"
-+		dnl -------------------------------------------------------------
-+		AC_CHECK_HEADERS([pango/pango.h pango/pangoxft.h],
-+			AC_CHECK_LIB(pango-1.0, pango_layout_new,
-+			AC_CHECK_LIB(pangoxft-1.0, pango_xft_render_layout,
-+				AC_DEFINE(USE_PANGO)
-+				pango_found=yes)))
-+	dnl	CPPFLAGS=$CXXFLAGS
- 	fi
- 
- 	dnl Check for the Xdbe extension unless disabled...
diff --git a/fltk14-devel/patches/patch-makeinclude.in b/fltk14-devel/patches/patch-makeinclude.in
index abc2e7fa62..9c0c909780 100644
--- a/fltk14-devel/patches/patch-makeinclude.in
+++ b/fltk14-devel/patches/patch-makeinclude.in
@@ -2,9 +2,9 @@ $NetBSD$
 
 Use libtool to build and link binaries.
 
---- makeinclude.in.orig	2015-03-25 20:06:54.000000000 +0000
+--- makeinclude.in.orig	2020-07-16 10:25:51.000000000 +0000
 +++ makeinclude.in
-@@ -153,20 +153,20 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
+@@ -151,20 +151,20 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
  
  .o$(EXEEXT):
  	echo Linking $@...
@@ -21,7 +21,7 @@ Use libtool to build and link binaries.
  	echo Compiling $<...
 -	$(CXX) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $< -o $@
 +	$(LIBTOOL) --mode=compile $(CXX) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $< -o $@
- 	
+ 
  .mm.o:
  	echo Compiling $<...
 -	$(CXX) -I.. $(ARCHFLAGS) $(CXXFLAGS) -x objective-c++ -c $< -o $@
diff --git a/fltk14-devel/patches/patch-test_Makefile b/fltk14-devel/patches/patch-test_Makefile
index b5cc21178c..eed39f615b 100644
--- a/fltk14-devel/patches/patch-test_Makefile
+++ b/fltk14-devel/patches/patch-test_Makefile
@@ -3,9 +3,9 @@ $NetBSD$
 Use libtool to link test programs.
 Add note that GUI test programs are not executed automatically.
 
---- test/Makefile.orig	2019-09-24 10:57:29.000000000 +0000
+--- test/Makefile.orig	2020-07-16 10:25:51.000000000 +0000
 +++ test/Makefile
-@@ -182,6 +182,10 @@ GLALL = \
+@@ -180,6 +180,10 @@ GLALL = \
  	shape$(EXEEXT)
  
  all:	$(ALL) $(GLDEMOS)
@@ -16,7 +16,7 @@ Add note that GUI test programs are not executed automatically.
  
  gldemos:	$(GLALL)
  
-@@ -333,7 +337,7 @@ buttons$(EXEEXT): buttons.o
+@@ -332,14 +336,14 @@ buttons$(EXEEXT): buttons.o
  
  blocks$(EXEEXT): blocks.o
  	echo Linking $@...
@@ -25,29 +25,28 @@ Add note that GUI test programs are not executed automatically.
  	$(OSX_ONLY) $(RM) -f -r blocks.app/Contents/MacOS
  	$(OSX_ONLY) mkdir blocks.app/Contents/MacOS
  	$(OSX_ONLY) $(INSTALL_BIN) blocks$(EXEEXT) blocks.app/Contents/MacOS
-@@ -344,7 +348,7 @@ checkers$(EXEEXT): pixmaps/black_checker
- 		   pixmaps/white_checker_king_png.h \
- 		   checkers.o
+ 
+ checkers$(EXEEXT): checkers.o checkers_pieces.o
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o checkers_pieces.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o checkers_pieces.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
  	$(OSX_ONLY) $(RM) -f -r checkers.app/Contents/MacOS
  	$(OSX_ONLY) mkdir checkers.app/Contents/MacOS
  	$(OSX_ONLY) $(INSTALL_BIN) checkers$(EXEEXT) checkers.app/Contents/MacOS
-@@ -353,7 +357,7 @@ clock$(EXEEXT): clock.o
+@@ -352,7 +356,7 @@ clock$(EXEEXT): clock.o
  
  colbrowser$(EXEEXT): colbrowser.o
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS)
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTK) $(LDLIBS)
 +	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS)
  	$(OSX_ONLY) ../fltk-config --post $@
  	$(OSX_ONLY) mkdir -p colbrowser.app/Contents/Resources
  	$(OSX_ONLY) cp -f rgb.txt colbrowser.app/Contents/Resources/
-@@ -366,21 +370,21 @@ curve$(EXEEXT): curve.o
+@@ -365,21 +369,21 @@ curve$(EXEEXT): curve.o
  
  demo$(EXEEXT): demo.o
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS)
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTK) $(LDLIBS)
 +	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS)
  	$(OSX_ONLY) ../fltk-config --post $@
  	$(OSX_ONLY) mkdir -p demo.app/Contents/Resources
@@ -68,7 +67,7 @@ Add note that GUI test programs are not executed automatically.
  	$(OSX_ONLY) ../fltk-config --post $@
  	$(OSX_ONLY) cp -f editor-Info.plist editor.app/Contents/Info.plist
  
-@@ -389,21 +393,21 @@ fast_slow.cxx:	fast_slow.fl ../fluid/flu
+@@ -388,21 +392,21 @@ fast_slow.cxx:	fast_slow.fl ../fluid/flu
  
  file_chooser$(EXEEXT): file_chooser.o $(IMGLIBNAME)
  	echo Linking $@...
@@ -93,7 +92,7 @@ Add note that GUI test programs are not executed automatically.
  	$(OSX_ONLY) ../fltk-config --post $@
  	$(OSX_ONLY) mkdir -p help_dialog.app/Contents/Resources
  	$(OSX_ONLY) cp -f help_dialog.html help_dialog.app/Contents/Resources/
-@@ -423,14 +427,14 @@ input_choice$(EXEEXT): input_choice.o
+@@ -422,14 +426,14 @@ input_choice$(EXEEXT): input_choice.o
  
  keyboard$(EXEEXT): keyboard_ui.o keyboard.o
  	echo Linking $@...
@@ -105,12 +104,12 @@ Add note that GUI test programs are not executed automatically.
  
  label$(EXEEXT): label.o
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS)
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTK) $(LDLIBS)
 +	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS)
  	$(OSX_ONLY) ../fltk-config --post $@
  
  line_style$(EXEEXT): line_style.o
-@@ -439,7 +443,7 @@ list_visuals$(EXEEXT): list_visuals.o
+@@ -438,7 +442,7 @@ list_visuals$(EXEEXT): list_visuals.o
  
  mandelbrot$(EXEEXT): mandelbrot_ui.o mandelbrot.o
  	echo Linking $@...
@@ -119,7 +118,7 @@ Add note that GUI test programs are not executed automatically.
  	$(OSX_ONLY) ../fltk-config --post $@
  mandelbrot_ui.o:	mandelbrot_ui.h
  mandelbrot_ui.cxx:	mandelbrot_ui.fl ../fluid/fluid$(EXEEXT)
-@@ -452,7 +456,7 @@ minimum$(EXEEXT): minimum.o
+@@ -451,7 +455,7 @@ minimum$(EXEEXT): minimum.o
  
  native-filechooser$(EXEEXT): native-filechooser.o $(IMGLIBNAME)
  	echo Linking $@...
@@ -128,16 +127,16 @@ Add note that GUI test programs are not executed automatically.
  	$(OSX_ONLY) ../fltk-config --post $@
  
  navigation$(EXEEXT): navigation.o
-@@ -461,7 +465,7 @@ offscreen$(EXEEXT): offscreen.o
+@@ -460,7 +464,7 @@ offscreen$(EXEEXT): offscreen.o
  
  output$(EXEEXT): output.o $(FLLIBNAME)
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS)
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTK) $(LDLIBS)
 +	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS)
  	$(OSX_ONLY) ../fltk-config --post $@
  
  overlay$(EXEEXT): overlay.o
-@@ -472,7 +476,7 @@ pixmap$(EXEEXT): pixmap.o
+@@ -471,7 +475,7 @@ pixmap$(EXEEXT): pixmap.o
  
  pixmap_browser$(EXEEXT): pixmap_browser.o $(IMGLIBNAME)
  	echo Linking $@...
@@ -146,7 +145,7 @@ Add note that GUI test programs are not executed automatically.
  	$(OSX_ONLY) ../fltk-config --post $@
  
  preferences$(EXEEXT):	preferences.o
-@@ -496,7 +500,7 @@ subwindow$(EXEEXT): subwindow.o
+@@ -495,7 +499,7 @@ subwindow$(EXEEXT): subwindow.o
  
  sudoku: sudoku.o
  	echo Linking $@...
@@ -155,7 +154,7 @@ Add note that GUI test programs are not executed automatically.
  	$(OSX_ONLY) $(RM) -r -f sudoku.app/Contents/MacOS
  	$(OSX_ONLY) mkdir sudoku.app/Contents/MacOS
  	$(OSX_ONLY) $(INSTALL_BIN) sudoku$(EXEEXT) sudoku.app/Contents/MacOS
-@@ -504,7 +508,7 @@ sudoku: sudoku.o
+@@ -503,7 +507,7 @@ sudoku: sudoku.o
  sudoku.exe: sudoku.o sudoku.rc
  	echo Linking $@...
  	$(RC) sudoku.rc sudokures.o
@@ -164,7 +163,7 @@ Add note that GUI test programs are not executed automatically.
  
  symbols$(EXEEXT): symbols.o
  
-@@ -536,7 +540,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME)
+@@ -535,7 +539,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME)
  # OpenGL demos...
  CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o
  	echo Linking $@...
@@ -173,7 +172,7 @@ Add note that GUI test programs are not executed automatically.
  		CubeMain.o CubeView.o CubeViewUI.o \
  		$(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
  	$(OSX_ONLY) ../fltk-config --post $@
-@@ -547,37 +551,37 @@ CubeViewUI.cxx:	CubeViewUI.fl ../fluid/f
+@@ -546,35 +550,35 @@ CubeViewUI.cxx:	CubeViewUI.fl ../fluid/f
  
  cube$(EXEEXT): cube.o
  	echo Linking $@...
@@ -208,7 +207,7 @@ Add note that GUI test programs are not executed automatically.
  shape$(EXEEXT): shape.o
  	echo Linking $@...
 -	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ shape.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
-+	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ shape.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
++	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ gl_overlay.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
  	$(OSX_ONLY) ../fltk-config --post $@
  
  cairo_test$(EXEEXT): cairo_test.o
@@ -216,5 +215,3 @@ Add note that GUI test programs are not executed automatically.
 -	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(CAIROFLAGS) $(LDFLAGS) -o $@ cairo_test.o $(LINKFLTK) $(LINKFLTKCAIRO) $(GLDLIBS)
 +	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(CAIROFLAGS) $(LDFLAGS) -o $@ cairo_test.o $(LINKFLTK) $(LINKFLTKCAIRO) $(GLDLIBS)
  	$(OSX_ONLY) ../fltk-config --post $@
- 
- # Checkers .png -> .h conversion
Prev by Date: Fix RPATH in GNOME binaries
Next by Date: wyebadblock-git: Add steps to reproduce surf-git problem
Previous by Thread: Fix RPATH in GNOME binaries
Next by Thread: wyebadblock-git: Add steps to reproduce surf-git problem
Indexes:
Home | Main Index | Thread Index | Old Index