Fix use of LDFLAGS and make install depend on all target...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5264 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
parent
a24e33b36e
commit
58699112db
@ -57,14 +57,14 @@ all: $(FLUID) fluid$(EXEEXT)
|
||||
fluid$(EXEEXT): $(OBJECTS) ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) \
|
||||
../lib/$(IMGLIBNAME)
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
$(CP) $@ fluid.app/Contents/MacOS
|
||||
|
||||
fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
|
||||
../src/$(IMGDSONAME)
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
|
||||
clean:
|
||||
|
||||
@ -75,8 +75,9 @@ DSOCOMMAND = @DSOCOMMAND@
|
||||
|
||||
# libraries to link with:
|
||||
AUDIOLIBS = @AUDIOLIBS@
|
||||
LDLIBS = @LDFLAGS@ @LIBS@
|
||||
GLDLIBS = @LDFLAGS@ @GLLIB@ @LIBS@
|
||||
LDFLAGS = $(OPTIM) @LDFLAGS@
|
||||
LDLIBS = @LIBS@
|
||||
GLDLIBS = @GLLIB@ @LIBS@
|
||||
LINKFLTK = @LINKFLTK@
|
||||
LINKFLTKGL = @LINKFLTKGL@
|
||||
LINKFLTKFORMS = @LINKFLTKFORMS@ @LINKFLTK@
|
||||
@ -119,7 +120,7 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
|
||||
|
||||
.o$(EXEEXT):
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
|
||||
.c.o:
|
||||
|
||||
@ -176,7 +176,7 @@ clean:
|
||||
-$(RM) checkers.app/Contents/MacOS/checkers
|
||||
-$(RM) sudoku.app/Contents/MacOS/sudoku
|
||||
|
||||
install:
|
||||
install: all
|
||||
echo "Installing example programs to $(DESTDIR)$(docdir)/examples..."
|
||||
-$(MKDIR) $(DESTDIR)$(docdir)/examples
|
||||
$(CP) *.h *.cxx *.fl demo.menu *.xbm *.xpm $(DESTDIR)$(docdir)/examples
|
||||
@ -258,7 +258,7 @@ buttons$(EXEEXT): buttons.o
|
||||
|
||||
checkers$(EXEEXT): checkers.o
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS)
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS)
|
||||
$(CP) checkers$(EXEEXT) checkers.app/Contents/MacOS
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
|
||||
@ -266,7 +266,7 @@ clock$(EXEEXT): clock.o
|
||||
|
||||
colbrowser$(EXEEXT): colbrowser.o
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS)
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS)
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
|
||||
color_chooser$(EXEEXT): color_chooser.o
|
||||
@ -277,14 +277,14 @@ curve$(EXEEXT): curve.o
|
||||
|
||||
demo$(EXEEXT): demo.o
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS)
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS)
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
|
||||
doublebuffer$(EXEEXT): doublebuffer.o
|
||||
|
||||
editor$(EXEEXT): editor.o
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
|
||||
fast_slow$(EXEEXT): fast_slow.o
|
||||
@ -292,21 +292,21 @@ fast_slow.cxx: fast_slow.fl
|
||||
|
||||
file_chooser$(EXEEXT): file_chooser.o ../lib/$(IMGLIBNAME)
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
|
||||
fonts$(EXEEXT): fonts.o
|
||||
|
||||
forms$(EXEEXT): forms.o
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ forms.o $(LINKFLTKFORMS) $(LDLIBS)
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ forms.o $(LINKFLTKFORMS) $(LDLIBS)
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
|
||||
hello$(EXEEXT): hello.o
|
||||
|
||||
help$(EXEEXT): help.o ../lib/$(IMGLIBNAME)
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
|
||||
iconize$(EXEEXT): iconize.o
|
||||
@ -322,14 +322,14 @@ input_choice$(EXEEXT): input_choice.o
|
||||
|
||||
keyboard$(EXEEXT): keyboard_ui.o keyboard.o
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS)
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS)
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
keyboard_ui.o: keyboard_ui.h
|
||||
keyboard_ui.cxx: keyboard_ui.fl
|
||||
|
||||
label$(EXEEXT): label.o
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS)
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS)
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
|
||||
line_style$(EXEEXT): line_style.o
|
||||
@ -338,7 +338,7 @@ list_visuals$(EXEEXT): list_visuals.o
|
||||
|
||||
mandelbrot$(EXEEXT): mandelbrot_ui.o mandelbrot.o
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ mandelbrot.o mandelbrot_ui.o $(LINKFLTK) $(LDLIBS)
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ mandelbrot.o mandelbrot_ui.o $(LINKFLTK) $(LDLIBS)
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
mandelbrot_ui.o: mandelbrot_ui.h
|
||||
mandelbrot_ui.cxx: mandelbrot_ui.fl
|
||||
@ -353,7 +353,7 @@ navigation$(EXEEXT): navigation.o
|
||||
|
||||
output$(EXEEXT): output.o ../lib/$(FLLIBNAME)
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS)
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS)
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
|
||||
overlay$(EXEEXT): overlay.o
|
||||
@ -364,7 +364,7 @@ pixmap$(EXEEXT): pixmap.o
|
||||
|
||||
pixmap_browser$(EXEEXT): pixmap_browser.o ../lib/$(IMGLIBNAME)
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
|
||||
preferences$(EXEEXT): preferences.o
|
||||
@ -384,14 +384,14 @@ subwindow$(EXEEXT): subwindow.o
|
||||
|
||||
sudoku: sudoku.o
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
|
||||
$(CP) sudoku$(EXEEXT) sudoku.app/Contents/MacOS
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
|
||||
sudoku.exe: sudoku.o sudoku.rc
|
||||
echo Linking $@...
|
||||
windres sudoku.rc sudokures.o
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) sudoku.o sudokures.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) sudoku.o sudokures.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
|
||||
|
||||
symbols$(EXEEXT): symbols.o
|
||||
|
||||
@ -416,7 +416,7 @@ $(GLALL): ../lib/$(LIBNAME) ../lib/$(GLLIBNAME)
|
||||
# OpenGL demos...
|
||||
CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ \
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ \
|
||||
CubeMain.o CubeView.o CubeViewUI.o \
|
||||
$(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
@ -427,27 +427,27 @@ CubeViewUI.cxx: CubeViewUI.fl
|
||||
|
||||
cube$(EXEEXT): cube.o
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ cube.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ cube.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
fractals$(EXEEXT): fractals.o fracviewer.o
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ fractals.o fracviewer.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ fractals.o fracviewer.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
fullscreen$(EXEEXT): fullscreen.o
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ fullscreen.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ fullscreen.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
glpuzzle$(EXEEXT): glpuzzle.o
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ glpuzzle.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ glpuzzle.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
gl_overlay$(EXEEXT): gl_overlay.o
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ gl_overlay.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ gl_overlay.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
shape$(EXEEXT): shape.o
|
||||
echo Linking $@...
|
||||
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ shape.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
|
||||
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ shape.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
|
||||
$(POSTBUILD) $@ ../FL/mac.r
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user