diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-12-14 02:23:01 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-12-14 02:23:01 +0000 |
| commit | 4ba1119822120de84b61ef7d503117b248119720 (patch) | |
| tree | c0f72c6a5c1db386916c284c0655584827a30ac9 | |
| parent | 9d060d717c392c0fa4f68c00d313ef936129862a (diff) | |
Workaround Solaris make problems...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4706 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | makeinclude.in | 2 | ||||
| -rw-r--r-- | test/Makefile | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/makeinclude.in b/makeinclude.in index e87c95eb5..89311336e 100644 --- a/makeinclude.in +++ b/makeinclude.in @@ -113,7 +113,7 @@ CAT3EXT = @CAT3EXT@ .o$(EXEEXT): echo Linking $@... - $(CXX) -I.. @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ + $(CXX) $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ $(POSTBUILD) $@ ../FL/mac.r .c.o: diff --git a/test/Makefile b/test/Makefile index acb516929..59c85c47e 100644 --- a/test/Makefile +++ b/test/Makefile @@ -217,7 +217,7 @@ clock$(EXEEXT): clock.o colbrowser$(EXEEXT): colbrowser.o echo Linking $@... - $(CXX) -I.. $(CXXFLAGS) -o $@ $< $(LINKFLTKFORMS) $(LDLIBS) + $(CXX) -I.. $(CXXFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS) $(POSTBUILD) $@ ../FL/mac.r color_chooser$(EXEEXT): color_chooser.o @@ -228,7 +228,7 @@ curve$(EXEEXT): curve.o demo$(EXEEXT): demo.o echo Linking $@... - $(CXX) -I.. $(CXXFLAGS) -o $@ $< $(LINKFLTKFORMS) $(LDLIBS) + $(CXX) -I.. $(CXXFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS) $(POSTBUILD) $@ ../FL/mac.r doublebuffer$(EXEEXT): doublebuffer.o @@ -250,7 +250,7 @@ fonts$(EXEEXT): fonts.o forms$(EXEEXT): forms.o echo Linking $@... - $(CXX) -I.. $(CXXFLAGS) -o $@ $< $(LINKFLTKFORMS) $(LDLIBS) + $(CXX) -I.. $(CXXFLAGS) -o $@ forms.o $(LINKFLTKFORMS) $(LDLIBS) $(POSTBUILD) $@ ../FL/mac.r hello$(EXEEXT): hello.o @@ -280,7 +280,7 @@ keyboard_ui.cxx: keyboard_ui.fl label$(EXEEXT): label.o echo Linking $@... - $(CXX) -I.. $(CXXFLAGS) -o $@ $< $(LINKFLTKFORMS) $(LDLIBS) + $(CXX) -I.. $(CXXFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS) $(POSTBUILD) $@ ../FL/mac.r line_style$(EXEEXT): line_style.o @@ -304,7 +304,7 @@ navigation$(EXEEXT): navigation.o output$(EXEEXT): output.o ../lib/$(FLLIBNAME) echo Linking $@... - $(CXX) -I.. $(CXXFLAGS) -o $@ $< $(LINKFLTKFORMS) $(LDLIBS) + $(CXX) -I.. $(CXXFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS) $(POSTBUILD) $@ ../FL/mac.r overlay$(EXEEXT): overlay.o |