pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
fltk-devel: Use libtool
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By: micha
Date: Mon Jan 20 15:10:24 2025 +0100
Changeset: 5525e8966784463a565bb6fb0db9c15b7b7b90e1
Modified Files:
fltk14-devel/Makefile
fltk14-devel/PLIST
fltk14-devel/TODO
fltk14-devel/distinfo
Added Files:
fltk14-devel/patches/patch-cairo_Makefile
fltk14-devel/patches/patch-configure
fltk14-devel/patches/patch-fltk-options_Makefile
fltk14-devel/patches/patch-fluid_Makefile
fltk14-devel/patches/patch-makeinclude.in
fltk14-devel/patches/patch-src_Makefile
fltk14-devel/patches/patch-test_Makefile
Log Message:
fltk-devel: Use libtool
FLTK 1.4.x is not binary compatible with 1.3.x, therefore the field "current"
in the libtool version is now 2.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5525e8966784463a565bb6fb0db9c15b7b7b90e1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
fltk14-devel/Makefile | 5 +-
fltk14-devel/PLIST | 20 +-
fltk14-devel/TODO | 5 +-
fltk14-devel/distinfo | 7 +
fltk14-devel/patches/patch-cairo_Makefile | 28 +++
fltk14-devel/patches/patch-configure | 61 +++++
fltk14-devel/patches/patch-fltk-options_Makefile | 25 ++
fltk14-devel/patches/patch-fluid_Makefile | 25 ++
fltk14-devel/patches/patch-makeinclude.in | 43 ++++
fltk14-devel/patches/patch-src_Makefile | 91 +++++++
fltk14-devel/patches/patch-test_Makefile | 298 +++++++++++++++++++++++
11 files changed, 588 insertions(+), 20 deletions(-)
diffs:
diff --git a/fltk14-devel/Makefile b/fltk14-devel/Makefile
index 8d8fcbb750..9877fdbca0 100644
--- a/fltk14-devel/Makefile
+++ b/fltk14-devel/Makefile
@@ -21,16 +21,15 @@ USE_LIBTOOL= yes
PTHREAD_OPTS+= require
GNU_CONFIGURE= yes
+GNU_CONFIGURE_STRICT= no # --enable-libtool is not officially known
+CONFIGURE_ARGS+= --enable-libtool=${LIBTOOL:Q}
CONFIGURE_ARGS+= --enable-print
-CONFIGURE_ARGS+= --enable-shared
CONFIGURE_ARGS+= --enable-svg
CONFIGURE_ARGS+= --enable-threads
-
# Use pkgsrc versions of libraries, not package's bundled versions
CONFIGURE_ARGS+= --disable-localjpeg
CONFIGURE_ARGS+= --disable-localpng
CONFIGURE_ARGS+= --disable-localzlib
-
# Disable build of test programs
CONFIGURE_ARGS+= --disable-test
diff --git a/fltk14-devel/PLIST b/fltk14-devel/PLIST
index 739a9484da..7411c4bcb5 100644
--- a/fltk14-devel/PLIST
+++ b/fltk14-devel/PLIST
@@ -167,21 +167,11 @@ include/FL/wayland.H
include/FL/win32.H
include/FL/x.H
include/FL/x11.H
-lib/libfltk.a
-lib/libfltk.so
-lib/libfltk.so.1.4
-${PLIST.cairo}lib/libfltk_cairo.a
-${PLIST.cairo}lib/libfltk_cairo.so
-${PLIST.cairo}lib/libfltk_cairo.so.1.4
-lib/libfltk_forms.a
-lib/libfltk_forms.so
-lib/libfltk_forms.so.1.4
-${PLIST.opengl}lib/libfltk_gl.a
-${PLIST.opengl}lib/libfltk_gl.so
-${PLIST.opengl}lib/libfltk_gl.so.1.4
-lib/libfltk_images.a
-lib/libfltk_images.so
-lib/libfltk_images.so.1.4
+lib/libfltk.la
+${PLIST.cairo}lib/libfltk_cairo.la
+lib/libfltk_forms.la
+${PLIST.opengl}lib/libfltk_gl.la
+lib/libfltk_images.la
man/man1/fltk-config.1
man/man1/fltk-options.1
man/man1/fluid.1
diff --git a/fltk14-devel/TODO b/fltk14-devel/TODO
index 5955b19967..81f1a1ecf7 100644
--- a/fltk14-devel/TODO
+++ b/fltk14-devel/TODO
@@ -5,10 +5,11 @@
Fixed upstream (Issue #942).
[X] Support for NetBSD
Fixed upstream (Issue #944).
-[ ] Static libraries should not be installed with execute permissions
+[X] Static libraries should not be installed with execute permissions
"fltk.list" has entires with 444 permissions, looks like a bug.
-[ ] Check for library suffixes on AIX, HP-UX and macOS
+[X] Check for library suffixes on AIX, HP-UX and macOS
Should use libtool like FLTK 1.3
+[ ] Library soname should be libfltk.so.1.4
[X] Build test programs only on request (make test)
This was rejected upstream (Issue #940).
Disable build of test programs with new option "--disable-test".
diff --git a/fltk14-devel/distinfo b/fltk14-devel/distinfo
index 698b10d702..e1227bea55 100644
--- a/fltk14-devel/distinfo
+++ b/fltk14-devel/distinfo
@@ -3,4 +3,11 @@ $NetBSD$
BLAKE2s (fltk-1.4.1-source.tar.bz2) = a6bd639364903fa157331cc00b1d8d1b91e64e3c64b2ddb64a5a27747cb104e8
SHA512 (fltk-1.4.1-source.tar.bz2) = 90b223f66e3a8eb23225a259cddfeb90f1f8744ff6a366f274923c1c34d251e028835755d1738efb53398ac7e45e362a71542978faef04fc3d84a87f7b722037
Size (fltk-1.4.1-source.tar.bz2) = 8456879 bytes
+SHA1 (patch-cairo_Makefile) = 578c24fac83e61f68c934159f28f5abd05896d27
+SHA1 (patch-configure) = 1beca8af8341f344623f04b9d89cac53119cf1ef
SHA1 (patch-documentation_Makefile) = a7edaea63d7c4ef8b740281eaf65e6cb491487f9
+SHA1 (patch-fltk-options_Makefile) = ebfc6c34bb58304dd5ef8e35dbfb48c9e2d1b958
+SHA1 (patch-fluid_Makefile) = 7f12a68012ad77330af914aa6fbb8de61131c5cd
+SHA1 (patch-makeinclude.in) = 5a7213151af33b6f14c735aeebf416064e2c8dc6
+SHA1 (patch-src_Makefile) = b3ba47afcb87d31fc765ffa219bec75f1717f8cf
+SHA1 (patch-test_Makefile) = 18be155add5a8d50e9a64477c0088c190326f0cd
diff --git a/fltk14-devel/patches/patch-cairo_Makefile b/fltk14-devel/patches/patch-cairo_Makefile
new file mode 100644
index 0000000000..43a6798696
--- /dev/null
+++ b/fltk14-devel/patches/patch-cairo_Makefile
@@ -0,0 +1,28 @@
+$NetBSD$
+
+Use libtool.
+Upstream will not merge this (libtool is listed as not acceptable).
+
+--- cairo/Makefile.orig 2024-12-12 17:45:50.000000000 +0000
++++ cairo/Makefile
+@@ -48,6 +48,10 @@ $(CAIROLIBNAME): $(CAIROOBJECTS)
+ $(LIBCOMMAND) $@ $(CAIROOBJECTS)
+ $(RANLIB) $@
+
++libfltk_cairo.la: $(CAIROOBJECTS) ../src/libfltk.la
++ echo $(DSOCOMMAND) $@ ...
++ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(CAIROOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 2:0:0 -L../src -lfltk $(CAIROLIBS) $(LDLIBS)
++
+ libfltk_cairo.so.$(FL_DSO_VERSION): $(CAIROOBJECTS) ../src/libfltk.so.$(FL_DSO_VERSION)
+ echo $(DSOCOMMAND) $@ ...
+ $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS)
+@@ -109,6 +113,9 @@ install: $(CAIROLIBNAME) $(CAIRODSONAME)
+ -$(INSTALL_DIR) $(DESTDIR)$(libdir)
+ $(INSTALL_LIB) $(CAIROLIBNAME) $(DESTDIR)$(libdir)
+
++ if test x$(CAIRODSONAME) = xlibfltk_cairo.la; then\
++ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_cairo.la $(DESTDIR)$(libdir); \
++ fi
+ if test x$(CAIRODSONAME) = xlibfltk_cairo.so.$(FL_DSO_VERSION); then\
+ $(RM) $(DESTDIR)$(libdir)/libfltk_cairo.so*;\
+ $(INSTALL_LIB) libfltk_cairo.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
diff --git a/fltk14-devel/patches/patch-configure b/fltk14-devel/patches/patch-configure
new file mode 100644
index 0000000000..103cd521f3
--- /dev/null
+++ b/fltk14-devel/patches/patch-configure
@@ -0,0 +1,61 @@
+$NetBSD$
+
+Add libtool support.
+Upstream will not merge this (libtool is listed as not acceptable).
+
+--- configure.orig 2024-12-12 22:49:01.000000000 +0000
++++ configure
+@@ -1489,6 +1489,7 @@ Optional Features:
+ --enable-use_std allow FLTK to use std::string etc.
+ --disable-print turn off print support (X11)
+ --enable-shared turn on shared libraries
++ --enable-libtool pkgsrc: Use libtool
+ --disable-svg disable SVG support
+ --disable-threads turn off multi-threading support
+ --enable-x11 use X11 with Cygwin or macOS (default=no)
+@@ -5174,6 +5175,18 @@ fi
+
+
+
++# pkgsrc: Check whether --enable-libtool or --disable-libtool was given.
++if test "${enable_libtool+set}" = set; then
++ enableval="$enable_libtool"
++
++if test x$enable_libtool != xno; then
++ LIBTOOL="$enable_libtool"
++ enable_shared=no
++else
++ LIBTOOL=""
++fi
++fi
++
+ if test "x$enable_shared" = xyes
+ then :
+
+@@ -5484,7 +5497,25 @@ fi
+
+
+
+-
++# pkgsrc: libtool support
++if test "x$LIBTOOL" != "x"; then
++ LINKFLTK="../src/libfltk.la"
++ if test "x$LINKFLTKGL" != "x"; then
++ LINKFLTKGL="../src/libfltk_gl.la"
++ fi
++ if test "x$LINKFLTKIMG" != "x"; then
++ LINKFLTKIMG="../src/libfltk_images.la"
++ fi
++ if test "x$LINKFLTKCAIRO" != "x"; then
++ LINKFLTKCAIRO="../src/libfltk_cairo.la"
++ fi
++ LINKSHARED="-lfltk_images -lfltk_forms -lfltk"
++ DSONAME="libfltk.la"
++ FLDSONAME="libfltk_forms.la"
++ GLDSONAME="libfltk_gl.la"
++ IMGDSONAME="libfltk_images.la"
++ CAIRODSONAME="libfltk_cairo.la"
++fi
+
+
+
diff --git a/fltk14-devel/patches/patch-fltk-options_Makefile b/fltk14-devel/patches/patch-fltk-options_Makefile
new file mode 100644
index 0000000000..341b2db5ec
--- /dev/null
+++ b/fltk14-devel/patches/patch-fltk-options_Makefile
@@ -0,0 +1,25 @@
+$NetBSD$
+
+Use libtool.
+Upstream will not merge this (libtool is listed as not acceptable).
+
+--- fltk-options/Makefile.orig 2024-12-12 17:45:50.000000000 +0000
++++ fltk-options/Makefile
+@@ -27,7 +27,7 @@ all: $(FLTK_OPTIONS) fltk-options$(EXEEX
+
+ fltk-options$(EXEEXT): $(OBJECTS) $(LIBNAME)
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKIMG) $(LDFLAGS) $(LDLIBS)
++ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKIMG) $(LDFLAGS) $(LDLIBS)
+ $(OSX_ONLY) $(RM) -r -f fltk-options.app
+ $(OSX_ONLY) mkdir -p fltk-options.app/Contents/MacOS fltk-options.app/Contents/Resources
+ $(OSX_ONLY) $(INSTALL_BIN) fltk-options fltk-options.app/Contents/MacOS
+@@ -56,7 +56,7 @@ include makedepend
+ install: all
+ echo "Installing fltk-options in $(DESTDIR)$(bindir)..."
+ -$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
+- $(INSTALL_BIN) $(FLTK_OPTIONS) "$(DESTDIR)$(bindir)/fltk-options$(EXEEXT)"
++ ${LIBTOOL} --mode=install $(INSTALL_BIN) $(FLTK_OPTIONS) "$(DESTDIR)$(bindir)/fltk-options$(EXEEXT)"
+
+ install-linux:
+ -$(INSTALL_DIR) "$(DESTDIR)/usr/share/applications"
diff --git a/fltk14-devel/patches/patch-fluid_Makefile b/fltk14-devel/patches/patch-fluid_Makefile
new file mode 100644
index 0000000000..d85e90031d
--- /dev/null
+++ b/fltk14-devel/patches/patch-fluid_Makefile
@@ -0,0 +1,25 @@
+$NetBSD$
+
+Use libtool.
+Upstream will not merge this (libtool is listed as not acceptable).
+
+--- fluid/Makefile.orig 2024-12-12 17:45:50.000000000 +0000
++++ fluid/Makefile
+@@ -69,7 +69,7 @@ all: $(FLUID) fluid$(EXEEXT)
+
+ fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(IMGLIBNAME)
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKIMG) $(LDFLAGS) $(LDLIBS)
++ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKIMG) $(LDFLAGS) $(LDLIBS)
+ $(OSX_ONLY) $(RM) -r -f fluid.app
+ $(OSX_ONLY) mkdir -p fluid.app/Contents/MacOS fluid.app/Contents/Resources
+ $(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
+@@ -98,7 +98,7 @@ include makedepend
+ install: all
+ echo "Installing FLUID in $(DESTDIR)$(bindir)..."
+ -$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
+- $(INSTALL_BIN) $(FLUID) "$(DESTDIR)$(bindir)/fluid$(EXEEXT)"
++ ${LIBTOOL} --mode=install $(INSTALL_BIN) $(FLUID) "$(DESTDIR)$(bindir)/fluid$(EXEEXT)"
+
+ install-linux:
+ -$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
diff --git a/fltk14-devel/patches/patch-makeinclude.in b/fltk14-devel/patches/patch-makeinclude.in
new file mode 100644
index 0000000000..74c9e499d1
--- /dev/null
+++ b/fltk14-devel/patches/patch-makeinclude.in
@@ -0,0 +1,43 @@
+$NetBSD$
+
+Do not use the static libraries created in "../lib".
+Use libtool.
+Upstream will not merge this (libtool is listed as not acceptable).
+
+--- makeinclude.in.orig 2024-12-12 17:45:50.000000000 +0000
++++ makeinclude.in
+@@ -107,7 +107,7 @@ LINKFLTKIMG = @LINKFLTKIMG@ @LINKFLTK@ $
+ LINKFLTKCAIRO = @LINKFLTKCAIRO@ $(CAIROLIBS)
+ FLTKCAIROOPTION = @FLTKCAIROOPTION@
+ LINKSHARED = @DSOLINK@ @LINKSHARED@ $(IMAGELIBS) $(CAIROLIBS)
+-IMAGELIBS = -L../lib @IMAGELIBS@
++IMAGELIBS = @IMAGELIBS@
+
+ # optional extra build step for fluid:
+ FLUIDDIR = @FLUIDDIR@
+@@ -169,20 +169,21 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
+
+ .o$(EXEEXT):
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ .c.o:
+ echo Compiling $<...
+- $(CC) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $< -o $@
++ $(LIBTOOL) --mode=compile $(CC) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $< -o $@
++
+
+ .cxx.o:
+ 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 $@
++ $(LIBTOOL) --mode=compile $(CXX) -I.. $(ARCHFLAGS) $(CXXFLAGS) -x objective-c++ -c $< -o $@
+
+
+ .man.0 .man.1 .man.3 .man.6:
diff --git a/fltk14-devel/patches/patch-src_Makefile b/fltk14-devel/patches/patch-src_Makefile
new file mode 100644
index 0000000000..68e8d15f64
--- /dev/null
+++ b/fltk14-devel/patches/patch-src_Makefile
@@ -0,0 +1,91 @@
+$NetBSD$
+
+Use libtool.
+Upstream will not merge this (libtool is listed as not acceptable).
+
+--- src/Makefile.orig 2024-12-12 17:45:50.000000000 +0000
++++ src/Makefile
+@@ -456,6 +456,10 @@ $(LIBNAME): $(OBJECTS)
+ $(LIBCOMMAND) $@ $(OBJECTS)
+ $(RANLIB) $@
+
++libfltk.la: $(OBJECTS)
++ echo $(DSOCOMMAND) $@ ...
++ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 2:0:0 $(LDLIBS) $(CAIROLIBS)
++
+ libfltk.so.$(FL_DSO_VERSION): $(OBJECTS)
+ echo $(DSOCOMMAND) $@ ...
+ $(DSOCOMMAND) $@ $(OBJECTS) $(LDFLAGS) $(LDLIBS) $(CAIROLIBS)
+@@ -492,6 +496,10 @@ $(FLLIBNAME): $(FLOBJECTS)
+ $(LIBCOMMAND) $@ $(FLOBJECTS)
+ $(RANLIB) $@
+
++libfltk_forms.la: $(FLOBJECTS) libfltk.la
++ echo $(DSOCOMMAND) $@ ...
++ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(FLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 2:0:0 -L. -lfltk $(LDLIBS)
++
+ libfltk_forms.so.$(FL_DSO_VERSION): $(FLOBJECTS) libfltk.so.$(FL_DSO_VERSION)
+ echo $(DSOCOMMAND) $@ ...
+ $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(LDFLAGS) $(LDLIBS)
+@@ -528,6 +536,10 @@ $(GLLIBNAME): $(GLOBJECTS)
+ $(LIBCOMMAND) $@ $(GLOBJECTS)
+ $(RANLIB) $@
+
++libfltk_gl.la: $(GLOBJECTS) libfltk.la
++ echo $(DSOCOMMAND) $@ ...
++ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(GLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 2:0:0 -L. -lfltk $(LDLIBS) $(GLDLIBS)
++
+ libfltk_gl.so.$(FL_DSO_VERSION): $(GLOBJECTS) libfltk.so.$(FL_DSO_VERSION)
+ echo $(DSOCOMMAND) $@ ...
+ $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(LDFLAGS) $(LDLIBS) $(GLDLIBS)
+@@ -564,6 +576,10 @@ $(IMGLIBNAME): $(IMGOBJECTS)
+ $(LIBCOMMAND) $@ $(IMGOBJECTS)
+ $(RANLIB) $@
+
++libfltk_images.la: $(IMGOBJECTS) libfltk.la
++ echo $(DSOCOMMAND) $@ ...
++ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(IMGOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 2:0:0 -L. $(IMAGELIBS) -lfltk $(LDLIBS)
++
+ libfltk_images.so.$(FL_DSO_VERSION): $(IMGOBJECTS) libfltk.so.$(FL_DSO_VERSION)
+ echo $(DSOCOMMAND) $@ ...
+ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(LDFLAGS) $(LDLIBS)
+@@ -866,6 +882,9 @@ install: $(LIBNAME) $(DSONAME) \
+ $(RANLIB) "$(DESTDIR)$(libdir)/$(GLLIBBASENAME)"; \
+ fi
+ $(RANLIB) "$(DESTDIR)$(libdir)/$(IMGLIBBASENAME)"
++ if test x$(DSONAME) = xlibfltk.la; then\
++ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk.la $(DESTDIR)$(libdir); \
++ fi
+ if test x$(DSONAME) = xlibfltk.so.$(FL_DSO_VERSION); then\
+ $(RM) "$(DESTDIR)$(libdir)"/libfltk.so*;\
+ $(INSTALL_LIB) libfltk.so.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)"; \
+@@ -897,6 +916,9 @@ install: $(LIBNAME) $(DSONAME) \
+ $(RM) "$(DESTDIR)$(libdir)/libfltk.dll.a";\
+ $(INSTALL_LIB) libfltk.dll.a "$(DESTDIR)$(libdir)"; \
+ fi
++ if test x$(FLDSONAME) = xlibfltk_forms.la; then\
++ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_forms.la $(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)"; \
+@@ -928,6 +950,9 @@ install: $(LIBNAME) $(DSONAME) \
+ $(RM) "$(DESTDIR)$(libdir)/libfltk_forms.dll.a";\
+ $(INSTALL_LIB) libfltk_forms.dll.a "$(DESTDIR)$(libdir)"; \
+ fi
++ if test x$(GLDSONAME) = xlibfltk_gl.la; then\
++ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_gl.la $(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)"; \
+@@ -959,6 +984,9 @@ install: $(LIBNAME) $(DSONAME) \
+ $(RM) "$(DESTDIR)$(libdir)/libfltk_gl.dll.a";\
+ $(INSTALL_LIB) libfltk_gl.dll.a "$(DESTDIR)$(libdir)"; \
+ fi
++ if test x$(IMGDSONAME) = xlibfltk_images.la; then\
++ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_images.la $(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)"; \
diff --git a/fltk14-devel/patches/patch-test_Makefile b/fltk14-devel/patches/patch-test_Makefile
new file mode 100644
index 0000000000..b1f29cf889
--- /dev/null
+++ b/fltk14-devel/patches/patch-test_Makefile
@@ -0,0 +1,298 @@
+$NetBSD$
+
+Use libtool.
+Upstream will not merge this (libtool is listed as not acceptable).
+
+--- test/Makefile.orig 2024-12-12 17:45:50.000000000 +0000
++++ test/Makefile
+@@ -368,7 +368,7 @@ buttons$(EXEEXT): buttons.o
+
+ blocks$(EXEEXT): blocks.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) blocks.o -o $@ $(AUDIOLIBS) $(LINKFLTK) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) blocks.o -o $@ $(AUDIOLIBS) $(LINKFLTK) $(LDLIBS)
+ $(OSX_ONLY) $(RM) -f -r blocks.app
+ $(OSX_ONLY) mkdir -p blocks.app/Contents/MacOS blocks.app/Contents/Resources
+ $(OSX_ONLY) $(INSTALL_BIN) blocks$(EXEEXT) blocks.app/Contents/MacOS
+@@ -377,7 +377,7 @@ blocks$(EXEEXT): blocks.o
+
+ checkers$(EXEEXT): checkers.o checkers_pieces.o
+ echo Linking $@...
+- $(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
+ $(OSX_ONLY) mkdir -p checkers.app/Contents/MacOS checkers.app/Contents/Resources
+ $(OSX_ONLY) $(INSTALL_BIN) checkers$(EXEEXT) checkers.app/Contents/MacOS
+@@ -391,14 +391,14 @@ checkers_pieces.cxx: checkers_pieces.fl
+
+ clipboard$(EXEEXT): clipboard.o $(IMGLIBNAME)
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) clipboard.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) clipboard.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ clock$(EXEEXT): clock.o
+
+ colbrowser$(EXEEXT): colbrowser.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTK) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTK) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+ $(OSX_ONLY) mkdir -p colbrowser.app/Contents/Resources
+ $(OSX_ONLY) cp -f rgb.txt colbrowser.app/Contents/Resources/
+@@ -413,21 +413,21 @@ curve$(EXEEXT): curve.o
+
+ demo$(EXEEXT): demo.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTK) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTK) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+ $(OSX_ONLY) mkdir -p demo.app/Contents/Resources
+ $(OSX_ONLY) cp -f demo.menu demo.app/Contents/Resources/
+
+ device$(EXEEXT): device.o $(IMGLIBNAME)
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) device.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) device.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ doublebuffer$(EXEEXT): doublebuffer.o
+
+ editor$(EXEEXT): editor.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+ $(OSX_ONLY) cp -f mac-resources/editor.plist editor.app/Contents/Info.plist
+
+@@ -436,7 +436,7 @@ fast_slow.cxx: fast_slow.fl ../fluid/flu
+
+ file_chooser$(EXEEXT): file_chooser.o $(IMGLIBNAME)
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ flex_demo$(EXEEXT): flex_demo.o
+@@ -449,7 +449,7 @@ fonts$(EXEEXT): fonts.o
+
+ forms$(EXEEXT): forms.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ forms.o $(LINKFLTKFORMS) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ forms.o $(LINKFLTKFORMS) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ grid_alignment$(EXEEXT): grid_alignment.o
+@@ -464,7 +464,7 @@ hello$(EXEEXT): hello.o
+
+ help_dialog$(EXEEXT): help_dialog.o $(IMGLIBNAME)
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help_dialog.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help_dialog.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+ $(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/
+@@ -484,14 +484,14 @@ input_choice$(EXEEXT): input_choice.o
+
+ keyboard$(EXEEXT): keyboard_ui.o keyboard.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+ keyboard_ui.o: keyboard_ui.h
+ keyboard_ui.cxx: keyboard_ui.fl ../fluid/fluid$(EXEEXT)
+
+ label$(EXEEXT): label.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTK) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTK) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ line_style$(EXEEXT): line_style.o
+@@ -502,7 +502,7 @@ list_visuals$(EXEEXT): list_visuals.o
+
+ mandelbrot$(EXEEXT): mandelbrot_ui.o mandelbrot.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ mandelbrot.o mandelbrot_ui.o $(LINKFLTK) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ mandelbrot.o mandelbrot_ui.o $(LINKFLTK) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+ mandelbrot_ui.o: mandelbrot_ui.h
+ mandelbrot_ui.cxx: mandelbrot_ui.fl ../fluid/fluid$(EXEEXT)
+@@ -515,7 +515,7 @@ minimum$(EXEEXT): minimum.o
+
+ native-filechooser$(EXEEXT): native-filechooser.o $(IMGLIBNAME)
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) native-filechooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) native-filechooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ navigation$(EXEEXT): navigation.o
+@@ -524,7 +524,7 @@ offscreen$(EXEEXT): offscreen.o
+
+ output$(EXEEXT): output.o $(FLLIBNAME)
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTK) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTK) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ overlay$(EXEEXT): overlay.o
+@@ -533,12 +533,12 @@ pack$(EXEEXT): pack.o
+
+ pixmap$(EXEEXT): pixmap.o $(IMGLIBNAME)
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ pixmap.o $(LINKFLTKIMG) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ pixmap.o $(LINKFLTKIMG) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ pixmap_browser$(EXEEXT): pixmap_browser.o $(IMGLIBNAME)
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ preferences$(EXEEXT): preferences.o
+@@ -556,52 +556,52 @@ resizebox$(EXEEXT): resizebox.o
+
+ resize-example1$(EXEEXT): resize-example1.o resize-arrows.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example1.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example1.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ resize-example2$(EXEEXT): resize-example2.o resize-arrows.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example2.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example2.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ resize-example3a$(EXEEXT): resize-example3a.o resize-arrows.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example3a.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example3a.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ resize-example3b$(EXEEXT): resize-example3b.o resize-arrows.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example3b.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example3b.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ resize-example3c$(EXEEXT): resize-example3c.o resize-arrows.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example3c.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example3c.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ resize-example4a$(EXEEXT): resize-example4a.o resize-arrows.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example4a.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example4a.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ resize-example4b$(EXEEXT): resize-example4b.o resize-arrows.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example4b.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example4b.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ resize-example5a$(EXEEXT): resize-example5a.o resize-arrows.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example5a.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example5a.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ resize-example5b$(EXEEXT): resize-example5b.o resize-arrows.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example5b.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example5b.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ resize-example5c$(EXEEXT): resize-example5c.o resize-arrows.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example5c.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) resize-example5c.o resize-arrows.o -o $@ $(LINKFLTK) $(LDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ rotated_text$(EXEEXT): rotated_text.o
+@@ -612,7 +612,7 @@ subwindow$(EXEEXT): subwindow.o
+
+ sudoku: sudoku.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
+ $(OSX_ONLY) $(RM) -f -r sudoku.app
+ $(OSX_ONLY) mkdir -p sudoku.app/Contents/MacOS sudoku.app/Contents/Resources
+ $(OSX_ONLY) $(INSTALL_BIN) sudoku$(EXEEXT) sudoku.app/Contents/MacOS
+@@ -621,7 +621,7 @@ sudoku: sudoku.o
+
+ sudoku.exe: sudoku.o sudoku.rc
+ echo Linking $@...
+- $(RC) sudoku.rc sudokures.o
++ $(LIBTOOL) --mode=link $(RC) sudoku.rc sudokures.o
+ $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o sudokures.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
+
+ symbols$(EXEEXT): symbols.o
+@@ -657,7 +657,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME)
+ # OpenGL demos...
+ CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ \
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ \
+ CubeMain.o CubeView.o CubeViewUI.o \
+ $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+@@ -668,45 +668,45 @@ CubeViewUI.cxx: CubeViewUI.fl ../fluid/f
+
+ cube$(EXEEXT): cube.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ cube.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ cube.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ fractals$(EXEEXT): fractals.o fracviewer.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ fractals.o fracviewer.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ fractals.o fracviewer.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ fullscreen$(EXEEXT): fullscreen.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ fullscreen.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ fullscreen.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ glpuzzle$(EXEEXT): glpuzzle.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ glpuzzle.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ glpuzzle.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ gl_overlay$(EXEEXT): gl_overlay.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ gl_overlay.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ gl_overlay.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ glut_test$(EXEEXT): glut_test.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ glut_test.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ glut_test.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ unittests$(EXEEXT): $(OBJUNITTEST)
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJUNITTEST) $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJUNITTEST) $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ 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)
+ $(OSX_ONLY) ../fltk-config --post $@
+
+ cairo_test$(EXEEXT): cairo_test.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(CAIROFLAGS) $(LDFLAGS) -o $@ cairo_test.o $(LINKFLTK) $(CAIROLIBS) $(GLDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(CAIROFLAGS) $(LDFLAGS) -o $@ cairo_test.o $(LINKFLTK) $(CAIROLIBS) $(GLDLIBS)
+ $(OSX_ONLY) ../fltk-config --post $@
Home |
Main Index |
Thread Index |
Old Index