summaryrefslogtreecommitdiff
path: root/x11/fltk13/patches
diff options
context:
space:
mode:
Diffstat (limited to 'x11/fltk13/patches')
-rw-r--r--x11/fltk13/patches/patch-aa28
-rw-r--r--x11/fltk13/patches/patch-ab50
-rw-r--r--x11/fltk13/patches/patch-ac49
-rw-r--r--x11/fltk13/patches/patch-ad16
-rw-r--r--x11/fltk13/patches/patch-ae22
-rw-r--r--x11/fltk13/patches/patch-af28
-rw-r--r--x11/fltk13/patches/patch-ag88
-rw-r--r--x11/fltk13/patches/patch-test_Makefile157
8 files changed, 438 insertions, 0 deletions
diff --git a/x11/fltk13/patches/patch-aa b/x11/fltk13/patches/patch-aa
new file mode 100644
index 00000000000..fb9d55b0d77
--- /dev/null
+++ b/x11/fltk13/patches/patch-aa
@@ -0,0 +1,28 @@
+$NetBSD: patch-aa,v 1.1.1.1 2011/12/01 16:35:12 is Exp $
+
+--- Makefile.orig 2011-02-15 15:29:03.000000000 +0000
++++ Makefile
+@@ -27,7 +27,7 @@
+
+ include makeinclude
+
+-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
++DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation
+
+ all: makeinclude fltk-config
+ for dir in $(DIRS); do\
+@@ -35,6 +35,14 @@ all: makeinclude fltk-config
+ (cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\
+ done
+
++test: makeinclude
++ dir=test;\
++ echo "=== making $$dir ===";\
++ if test ! -f $$dir/makedepend; then\
++ touch $$dir/makedepend;\
++ fi;\
++ (cd $$dir; $(MAKE) $(MFLAGS)) || break;\
++
+ install: makeinclude
+ -mkdir -p $(DESTDIR)$(bindir)
+ $(RM) $(DESTDIR)$(bindir)/fltk-config
diff --git a/x11/fltk13/patches/patch-ab b/x11/fltk13/patches/patch-ab
new file mode 100644
index 00000000000..2ffe7a5e0f3
--- /dev/null
+++ b/x11/fltk13/patches/patch-ab
@@ -0,0 +1,50 @@
+$NetBSD: patch-ab,v 1.1.1.1 2011/12/01 16:35:12 is Exp $
+
+--- configure.in.orig 2011-03-06 16:54:58.000000000 +0000
++++ configure.in
+@@ -187,6 +187,7 @@ AC_SUBST(IMGLIBNAME)
+ AC_SUBST(CAIROLIBNAME)
+ AC_SUBST(LIBEXT)
+ AC_SUBST(LIBNAME)
++AC_SUBST(LIBTOOL)
+ AC_SUBST(LINKFLTK)
+ AC_SUBST(LINKFLTKFORMS)
+ AC_SUBST(LINKFLTKGL)
+@@ -215,6 +216,15 @@ 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]])
++AC_ARG_ENABLE(libtool, [ --enable-libtool=LIBTOOL_PATH
++ turn on building with libtool [default=no]],[
++if eval "test x$enable_libtool != xno"; then
++ LIBTOOL="$enable_libtool"
++ enable_shared=no
++else
++ LIBTOOL=""
++fi])
++
+ if test x$enable_shared = xyes; then
+ PICFLAG=1
+ SHAREDSUFFIX=""
+@@ -353,6 +363,21 @@ else
+ LINKSHARED="$LINKFLTKCAIRO ../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a"
+ fi
+
++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
++ LINKSHARED="-lfltk_images -lfltk_forms -lfltk"
++ DSONAME="libfltk.la"
++ FLDSONAME="libfltk_forms.la"
++ GLDSONAME="libfltk_gl.la"
++ IMGDSONAME="libfltk_images.la"
++fi
++
+ AC_SUBST(DSOCOMMAND)
+ AC_SUBST(DSOFLAGS)
+ AC_SUBST(DSOLINK)
diff --git a/x11/fltk13/patches/patch-ac b/x11/fltk13/patches/patch-ac
new file mode 100644
index 00000000000..8817f44050e
--- /dev/null
+++ b/x11/fltk13/patches/patch-ac
@@ -0,0 +1,49 @@
+$NetBSD: patch-ac,v 1.1.1.1 2011/12/01 16:35:13 is Exp $
+
+--- configure.orig 2011-06-16 15:50:44.000000000 +0000
++++ configure
+@@ -1999,7 +1999,22 @@ if test "${enable_shared+set}" = set; th
+ enableval=$enable_shared;
+ fi
+
+-if test x$enable_shared = xyes; then
++
++# 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 "$enable_shared" = "yes"; then
++
+ PICFLAG=1
+ SHAREDSUFFIX=""
+ FLUID="fluid-shared"
+@@ -2138,6 +2153,20 @@ else
+ LINKSHARED="$LINKFLTKCAIRO ../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a"
+ fi
+
++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
++ LINKSHARED="-lfltk_images -lfltk_forms -lfltk"
++ DSONAME="libfltk.la"
++ FLDSONAME="libfltk_forms.la"
++ GLDSONAME="libfltk_gl.la"
++ IMGDSONAME="libfltk_images.la"
++fi
+
+
+
diff --git a/x11/fltk13/patches/patch-ad b/x11/fltk13/patches/patch-ad
new file mode 100644
index 00000000000..40facf5c2e8
--- /dev/null
+++ b/x11/fltk13/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1.1.1 2011/12/01 16:35:13 is Exp $
+
+--- documentation/Makefile.orig 2011-01-05 23:00:33.000000000 +0000
++++ documentation/Makefile
+@@ -92,11 +92,6 @@ install: $(MANPAGES)
+ $(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_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
diff --git a/x11/fltk13/patches/patch-ae b/x11/fltk13/patches/patch-ae
new file mode 100644
index 00000000000..ee4f792edbb
--- /dev/null
+++ b/x11/fltk13/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1.1.1 2011/12/01 16:35:13 is Exp $
+
+--- fluid/Makefile.orig 2010-12-20 20:33:24.000000000 +0000
++++ fluid/Makefile
+@@ -57,7 +57,7 @@ all: $(FLUID) fluid$(EXEEXT)
+ fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
+ $(IMGLIBNAME)
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
++ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS:.o=.lo) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
+ $(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
+
+ fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
+@@ -79,7 +79,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)/usr/share/applications
diff --git a/x11/fltk13/patches/patch-af b/x11/fltk13/patches/patch-af
new file mode 100644
index 00000000000..a9630c1f918
--- /dev/null
+++ b/x11/fltk13/patches/patch-af
@@ -0,0 +1,28 @@
+$NetBSD: patch-af,v 1.1.1.1 2011/12/01 16:35:13 is Exp $
+
+--- makeinclude.in.orig 2010-12-23 14:24:29.000000000 +0000
++++ makeinclude.in
+@@ -147,19 +147,19 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
+
+ .o$(EXEEXT):
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
+
+ .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/x11/fltk13/patches/patch-ag b/x11/fltk13/patches/patch-ag
new file mode 100644
index 00000000000..6a7f903ad97
--- /dev/null
+++ b/x11/fltk13/patches/patch-ag
@@ -0,0 +1,88 @@
+$NetBSD: patch-ag,v 1.1.1.1 2011/12/01 16:35:13 is Exp $
+
+--- src/Makefile.orig 2009-07-02 09:42:17.000000000 +0000
++++ src/Makefile
+@@ -208,6 +208,10 @@ $(LIBNAME): $(OBJECTS)
+ $(LIBCOMMAND) $@ $(OBJECTS)
+ $(RANLIB) $@
+
++libfltk.la: $(OBJECTS)
++ echo $(CXX) $@ ...
++ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS)
++
+ libfltk.so.1.3: $(OBJECTS)
+ echo $(DSOCOMMAND) $@ ...
+ $(DSOCOMMAND) $@ $(OBJECTS)
+@@ -244,6 +248,10 @@ $(FLLIBNAME): $(FLOBJECTS)
+ $(LIBCOMMAND) $@ $(FLOBJECTS)
+ $(RANLIB) $@
+
++libfltk_forms.la: $(FLOBJECTS)
++ echo $(CXX) $@ ...
++ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(FLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS)
++
+ libfltk_forms.so.1.3: $(FLOBJECTS) libfltk.so.1.3
+ echo $(DSOCOMMAND) $@ ...
+ $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
+@@ -280,6 +288,10 @@ $(GLLIBNAME): $(GLOBJECTS)
+ $(LIBCOMMAND) $@ $(GLOBJECTS)
+ $(RANLIB) $@
+
++libfltk_gl.la: $(GLOBJECTS)
++ echo $(CXX) $@ ...
++ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(GLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS)
++
+ libfltk_gl.so.1.3: $(GLOBJECTS) libfltk.so.1.3
+ echo $(DSOCOMMAND) $@ ...
+ $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
+@@ -316,6 +328,10 @@ $(IMGLIBNAME): $(IMGOBJECTS)
+ $(LIBCOMMAND) $@ $(IMGOBJECTS)
+ $(RANLIB) $@
+
++libfltk_images.la: $(IMGOBJECTS)
++ echo $(CXX) $@ ...
++ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(IMGOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS)
++
+ libfltk_images.so.1.3: $(IMGOBJECTS) libfltk.so.1.3
+ echo $(DSOCOMMAND) $@ ...
+ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
+@@ -504,6 +520,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.1.3; then\
+ $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
+ $(INSTALL_LIB) libfltk.so.1.3 $(DESTDIR)$(libdir); \
+@@ -523,6 +542,9 @@ install: $(LIBNAME) $(DSONAME) \
+ $(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\
+ $(INSTALL_LIB) libfltk_s.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$(DSONAME) = xcygfltknox-1.3.dll; then\
+ $(RM) $(DESTDIR)$(bindir)/$(DSONAME);\
+ $(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \
+@@ -540,6 +562,9 @@ install: $(LIBNAME) $(DSONAME) \
+ $(INSTALL_LIB) libfltk_forms.so.1.3 $(DESTDIR)$(libdir); \
+ $(LN) libfltk_forms.so.1.3 $(DESTDIR)$(libdir)/libfltk_forms.so;\
+ fi
++ if test x$(GLDSONAME) = xlibfltk_gl.la; then\
++ ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_gl.la $(DESTDIR)$(libdir); \
++ fi
+ if test x$(FLDSONAME) = xlibfltk_forms.sl.1.3; then\
+ $(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
+ $(INSTALL_LIB) libfltk_forms.sl.1.3 $(DESTDIR)$(libdir); \
+@@ -597,6 +622,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.1.3; then\
+ $(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\
+ $(INSTALL_LIB) libfltk_images.so.1.3 $(DESTDIR)$(libdir); \
diff --git a/x11/fltk13/patches/patch-test_Makefile b/x11/fltk13/patches/patch-test_Makefile
new file mode 100644
index 00000000000..02517716eb1
--- /dev/null
+++ b/x11/fltk13/patches/patch-test_Makefile
@@ -0,0 +1,157 @@
+$NetBSD: patch-test_Makefile,v 1.1.1.1 2011/12/01 16:35:13 is Exp $
+
+--- test/Makefile.orig 2011-02-06 14:08:08.000000000 +0000
++++ test/Makefile
+@@ -299,10 +296,10 @@ buttons$(EXEEXT): buttons.o
+ blocks$(EXEEXT): blocks.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) blocks.o -o $@ $(AUDIOLIBS) $(LINKFLTK) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) blocks.o -o $@ $(AUDIOLIBS) $(LINKFLTK) $(LDLIBS)
+ $(OSX_ONLY) $(INSTALL_BIN) blocks$(EXEEXT) blocks.app/Contents/MacOS
+
+ checkers$(EXEEXT): checkers.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS)
+ $(OSX_ONLY) $(INSTALL_BIN) checkers$(EXEEXT) checkers.app/Contents/MacOS
+
+@@ -311,5 +308,5 @@ clock$(EXEEXT): clock.o
+ colbrowser$(EXEEXT): colbrowser.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS)
+
+ color_chooser$(EXEEXT): color_chooser.o
+@@ -321,9 +318,9 @@ curve$(EXEEXT): curve.o
+ demo$(EXEEXT): demo.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS)
+
+ device$(EXEEXT): device.o $(IMGLIBNAME)
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) device.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) device.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+
+ doublebuffer$(EXEEXT): doublebuffer.o
+@@ -331,5 +328,5 @@ doublebuffer$(EXEEXT): doublebuffer.o
+ editor$(EXEEXT): editor.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+
+ fast_slow$(EXEEXT): fast_slow.o
+@@ -338,5 +335,5 @@ fast_slow.cxx: fast_slow.fl ../fluid/flu
+ file_chooser$(EXEEXT): file_chooser.o $(IMGLIBNAME)
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+
+ fonts$(EXEEXT): fonts.o
+@@ -344,5 +341,5 @@ fonts$(EXEEXT): fonts.o
+ forms$(EXEEXT): forms.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ forms.o $(LINKFLTKFORMS) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ forms.o $(LINKFLTKFORMS) $(LDLIBS)
+
+ hello$(EXEEXT): hello.o
+@@ -350,5 +347,5 @@ hello$(EXEEXT): hello.o
+ help$(EXEEXT): help.o $(IMGLIBNAME)
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+
+ iconize$(EXEEXT): iconize.o
+@@ -365,5 +362,5 @@ input_choice$(EXEEXT): input_choice.o
+ keyboard$(EXEEXT): keyboard_ui.o keyboard.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS)
+ keyboard_ui.o: keyboard_ui.h
+ keyboard_ui.cxx: keyboard_ui.fl ../fluid/fluid$(EXEEXT)
+@@ -371,5 +368,5 @@ keyboard_ui.cxx: keyboard_ui.fl ../fluid
+ label$(EXEEXT): label.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS)
+
+ line_style$(EXEEXT): line_style.o
+@@ -379,5 +376,5 @@ list_visuals$(EXEEXT): list_visuals.o
+ mandelbrot$(EXEEXT): mandelbrot_ui.o mandelbrot.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ mandelbrot.o mandelbrot_ui.o $(LINKFLTK) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ mandelbrot.o mandelbrot_ui.o $(LINKFLTK) $(LDLIBS)
+ mandelbrot_ui.o: mandelbrot_ui.h
+ mandelbrot_ui.cxx: mandelbrot_ui.fl ../fluid/fluid$(EXEEXT)
+@@ -391,5 +388,5 @@ minimum$(EXEEXT): minimum.o
+ native-filechooser$(EXEEXT): native-filechooser.o $(IMGLIBNAME)
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) native-filechooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) native-filechooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+
+ navigation$(EXEEXT): navigation.o
+@@ -397,5 +394,5 @@ navigation$(EXEEXT): navigation.o
+ output$(EXEEXT): output.o $(FLLIBNAME)
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS)
+
+ overlay$(EXEEXT): overlay.o
+@@ -407,5 +404,5 @@ pixmap$(EXEEXT): pixmap.o
+ pixmap_browser$(EXEEXT): pixmap_browser.o $(IMGLIBNAME)
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+
+ preferences$(EXEEXT): preferences.o
+@@ -430,5 +427,5 @@ subwindow$(EXEEXT): subwindow.o
+ sudoku: sudoku.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
+ $(OSX_ONLY) $(INSTALL_BIN) sudoku$(EXEEXT) sudoku.app/Contents/MacOS
+
+@@ -466,5 +463,5 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME)
+ CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ \
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ \
+ CubeMain.o CubeView.o CubeViewUI.o \
+ $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+@@ -476,29 +473,29 @@ CubeViewUI.cxx: CubeViewUI.fl ../fluid/f
+ cube$(EXEEXT): cube.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ cube.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ cube.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+
+ fractals$(EXEEXT): fractals.o fracviewer.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ fractals.o fracviewer.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ fractals.o fracviewer.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+
+ fullscreen$(EXEEXT): fullscreen.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ fullscreen.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ fullscreen.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+
+ glpuzzle$(EXEEXT): glpuzzle.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ glpuzzle.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ glpuzzle.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+
+ gl_overlay$(EXEEXT): gl_overlay.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ gl_overlay.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ gl_overlay.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+
+ shape$(EXEEXT): shape.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ shape.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ shape.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
+
+ cairo_test$(EXEEXT): cairo_test.o
+ echo Linking $@...
+- $(CXX) $(ARCHFLAGS) $(CAIROFLAGS) $(LDFLAGS) -o $@ cairo_test.o $(LINKFLTK) $(LINKFLTKCAIRO) $(GLDLIBS)
++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CAIROFLAGS) $(LDFLAGS) -o $@ cairo_test.o $(LINKFLTK) $(LINKFLTKCAIRO) $(GLDLIBS)
+
+ #