diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2017-02-08 02:06:52 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2017-02-08 02:06:52 +0000 |
| commit | 16774ddc4e000c89e560fde0ced8be9814ef041e (patch) | |
| tree | 38b8bdd8424070d56889f982591a6c4b413977f7 /test/Makefile | |
| parent | 759d2f1c99560468e17d656d395db87796deea94 (diff) | |
Rename test/help demo program to test/help_dialog.
This change avoids a name conflict with CMake's auto-generated target 'help'
for "Unix Makefiles", "Ninja", and supposedly other generators as well.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12171 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'test/Makefile')
| -rw-r--r-- | test/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/Makefile b/test/Makefile index c30b11fd2..5a9c5d16d 100644 --- a/test/Makefile +++ b/test/Makefile @@ -3,7 +3,7 @@ # # Test/example program makefile for the Fast Light Tool Kit (FLTK). # -# Copyright 1998-2010 by Bill Spitzak and others. +# Copyright 1998-2017 by Bill Spitzak and others. # # This library is free software. Distribution and use rights are outlined in # the file "COPYING" which should have been included with this file. If this @@ -53,7 +53,7 @@ CPPFILES =\ gl_overlay.cxx \ glpuzzle.cxx \ hello.cxx \ - help.cxx \ + help_dialog.cxx \ icon.cxx \ iconize.cxx \ image.cxx \ @@ -126,7 +126,7 @@ ALL = \ fonts$(EXEEXT) \ forms$(EXEEXT) \ hello$(EXEEXT) \ - help$(EXEEXT) \ + help_dialog$(EXEEXT) \ icon$(EXEEXT) \ iconize$(EXEEXT) \ image$(EXEEXT) \ @@ -368,12 +368,12 @@ forms$(EXEEXT): forms.o hello$(EXEEXT): hello.o -help$(EXEEXT): help.o $(IMGLIBNAME) +help_dialog$(EXEEXT): help_dialog.o $(IMGLIBNAME) echo Linking $@... - $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS) + $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help_dialog.o -o $@ $(LINKFLTKIMG) $(LDLIBS) $(OSX_ONLY) ../fltk-config --post $@ - $(OSX_ONLY) mkdir -p help.app/Contents/Resources - $(OSX_ONLY) cp -f help-test.html help.app/Contents/Resources/ + $(OSX_ONLY) mkdir -p help_dialog.app/Contents/Resources + $(OSX_ONLY) cp -f help_dialog.html help_dialog.app/Contents/Resources/ icon$(EXEEXT): icon.o |