220 lines
10 KiB
Plaintext
220 lines
10 KiB
Plaintext
$NetBSD$
|
|
|
|
Use libtool to link test programs.
|
|
Add note that GUI test programs are not executed automatically.
|
|
|
|
--- test/Makefile.orig 2020-07-16 10:25:51.000000000 +0000
|
|
+++ test/Makefile
|
|
@@ -196,6 +196,10 @@ GLALL = \
|
|
shape$(EXEEXT)
|
|
|
|
all: $(ALL) $(GLDEMOS)
|
|
+ echo "-------------------------------------------"
|
|
+ echo 'Test programs were built in $${WRKSRC}/test.'
|
|
+ echo "You have to start them manually."
|
|
+ echo "-------------------------------------------"
|
|
|
|
gldemos: $(GLALL)
|
|
|
|
@@ -348,14 +352,14 @@ 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/Contents/MacOS
|
|
$(OSX_ONLY) mkdir blocks.app/Contents/MacOS
|
|
$(OSX_ONLY) $(INSTALL_BIN) blocks$(EXEEXT) blocks.app/Contents/MacOS
|
|
|
|
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/Contents/MacOS
|
|
$(OSX_ONLY) mkdir checkers.app/Contents/MacOS
|
|
$(OSX_ONLY) $(INSTALL_BIN) checkers$(EXEEXT) checkers.app/Contents/MacOS
|
|
@@ -368,7 +372,7 @@ 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 $(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/
|
|
@@ -381,21 +385,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 $(LINKFLTKFORMS) $(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 editor-Info.plist editor.app/Contents/Info.plist
|
|
|
|
@@ -404,23 +408,23 @@ 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 $@
|
|
|
|
fltk-versions$(EXEEXT): fltk-versions.o
|
|
|
|
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 $@
|
|
|
|
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/
|
|
@@ -440,14 +444,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 $(LINKFLTKFORMS) $(LDLIBS)
|
|
$(OSX_ONLY) ../fltk-config --post $@
|
|
|
|
line_style$(EXEEXT): line_style.o
|
|
@@ -456,7 +460,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)
|
|
@@ -469,7 +473,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
|
|
@@ -478,7 +482,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 $(LINKFLTKFORMS) $(LDLIBS)
|
|
$(OSX_ONLY) ../fltk-config --post $@
|
|
|
|
overlay$(EXEEXT): overlay.o
|
|
@@ -489,7 +493,7 @@ pixmap$(EXEEXT): pixmap.o
|
|
|
|
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
|
|
@@ -548,7 +552,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) -r -f sudoku.app/Contents/MacOS
|
|
$(OSX_ONLY) mkdir sudoku.app/Contents/MacOS
|
|
$(OSX_ONLY) $(INSTALL_BIN) sudoku$(EXEEXT) sudoku.app/Contents/MacOS
|
|
@@ -556,7 +560,7 @@ sudoku: sudoku.o
|
|
sudoku.exe: sudoku.o sudoku.rc
|
|
echo Linking $@...
|
|
$(RC) sudoku.rc sudokures.o
|
|
- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o sudokures.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
|
|
+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o sudokures.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
|
|
|
|
symbols$(EXEEXT): symbols.o
|
|
|
|
@@ -588,7 +592,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 $@
|
|
@@ -599,35 +603,35 @@ 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 $@
|
|
|
|
shape$(EXEEXT): shape.o
|
|
echo Linking $@...
|
|
- $(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
|
|
echo Linking $@...
|
|
- $(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 $@
|