# HG changeset patch # User Michael Guravage # Date 2010-10-18 12:52:20 # Node ID 67230a3743ca2b45a56fa908a4bdb00372883014 # Parent b85aa64a84ee8c8c3e345866f9c846137942cebb Removed erroneous qmake -makefile option. MACOSX, look for gpl3.txt in ../doc directory. -- user: Michael Guravage branch 'default' changed src/ChangeLog changed src/Makefile changed src/TutorialCode/Tutorial0/ChangeLog changed src/TutorialCode/Tutorial0/Makefile changed src/TutorialCode/Tutorial1A/ChangeLog changed src/TutorialCode/Tutorial1A/Makefile changed src/TutorialCode/Tutorial1B/ChangeLog changed src/TutorialCode/Tutorial1B/Makefile changed src/TutorialCode/Tutorial1C/ChangeLog changed src/TutorialCode/Tutorial1C/Makefile changed src/TutorialCode/Tutorial1D/ChangeLog changed src/TutorialCode/Tutorial1D/Makefile changed src/TutorialCode/Tutorial2/ChangeLog changed src/TutorialCode/Tutorial2/Makefile changed src/TutorialCode/Tutorial3/ChangeLog changed src/TutorialCode/Tutorial3/Makefile changed src/TutorialCode/Tutorial4/ChangeLog changed src/TutorialCode/Tutorial4/Makefile changed src/TutorialCode/Tutorial5/ChangeLog changed src/TutorialCode/Tutorial5/Makefile changed src/VirtualLeaf.pro changed src/build_models/ChangeLog changed src/build_models/Makefile diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2010-10-18 + * VirtualLeaf.pro: MAXOSX, look for gpl3.txt in the ../doc directory. + + * Makefile (Makefile.libplugin): Removed -makefile qmake option. + * VirtualLeaf.cpp (TIMESTEP): Removed getIterations(). * mesh.h (Mesh): Removed {increment,get}Iterations(). diff --git a/src/Makefile b/src/Makefile --- a/src/Makefile +++ b/src/Makefile @@ -19,13 +19,13 @@ VirtualLeaf: Makefile.VirtualLeaf $(MAKE) -f Makefile.VirtualLeaf Makefile.VirtualLeaf: VirtualLeaf.pro - $(QMAKE) -makefile -o $@ $< + $(QMAKE) -o $@ $< libplugin: Makefile.libplugin $(MAKE) -f Makefile.libplugin Makefile.libplugin: libplugin.pro - $(QMAKE) -makefile -o $@ $< + $(QMAKE) -o $@ $< plugins: $(MAKE) -C build_models -f Makefile diff --git a/src/TutorialCode/Tutorial0/ChangeLog b/src/TutorialCode/Tutorial0/ChangeLog --- a/src/TutorialCode/Tutorial0/ChangeLog +++ b/src/TutorialCode/Tutorial0/ChangeLog @@ -1,3 +1,7 @@ +2010-10-18 + + * Makefile (Makefile.tutorial0): Removed -makefile qmake option. + 2010-06-25 * tutorial0.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS. diff --git a/src/TutorialCode/Tutorial0/Makefile b/src/TutorialCode/Tutorial0/Makefile --- a/src/TutorialCode/Tutorial0/Makefile +++ b/src/TutorialCode/Tutorial0/Makefile @@ -19,7 +19,7 @@ tutorial0: Makefile.tutorial0 $(MAKE) -f Makefile.tutorial0 Makefile.tutorial0: tutorial0.pro - $(QMAKE) -makefile -o $@ $< + $(QMAKE) -o $@ $< clean: $(MAKE) -f Makefile.tutorial0 clean diff --git a/src/TutorialCode/Tutorial1A/ChangeLog b/src/TutorialCode/Tutorial1A/ChangeLog --- a/src/TutorialCode/Tutorial1A/ChangeLog +++ b/src/TutorialCode/Tutorial1A/ChangeLog @@ -1,3 +1,7 @@ +2010-10-18 + + * Makefile (Makefile.tutorial1A): Removed -makefile qmake option. + 2010-06-25 * tutorial1A.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS. diff --git a/src/TutorialCode/Tutorial1A/Makefile b/src/TutorialCode/Tutorial1A/Makefile --- a/src/TutorialCode/Tutorial1A/Makefile +++ b/src/TutorialCode/Tutorial1A/Makefile @@ -19,7 +19,7 @@ tutorial1A: Makefile.tutorial1A $(MAKE) -f Makefile.tutorial1A Makefile.tutorial1A: tutorial1A.pro - $(QMAKE) -makefile -o $@ $< + $(QMAKE) -o $@ $< clean: $(MAKE) -f Makefile.tutorial1A clean diff --git a/src/TutorialCode/Tutorial1B/ChangeLog b/src/TutorialCode/Tutorial1B/ChangeLog --- a/src/TutorialCode/Tutorial1B/ChangeLog +++ b/src/TutorialCode/Tutorial1B/ChangeLog @@ -1,3 +1,7 @@ +2010-10-18 + + * Makefile (Makefile.tutorial1B): Removed -makefile qmake option. + 2010-06-25 * tutorial1B.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS. diff --git a/src/TutorialCode/Tutorial1B/Makefile b/src/TutorialCode/Tutorial1B/Makefile --- a/src/TutorialCode/Tutorial1B/Makefile +++ b/src/TutorialCode/Tutorial1B/Makefile @@ -19,7 +19,7 @@ tutorial1B: Makefile.tutorial1B $(MAKE) -f Makefile.tutorial1B Makefile.tutorial1B: tutorial1B.pro - $(QMAKE) -makefile -o $@ $< + $(QMAKE) -o $@ $< clean: $(MAKE) -f Makefile.tutorial1B clean diff --git a/src/TutorialCode/Tutorial1C/ChangeLog b/src/TutorialCode/Tutorial1C/ChangeLog --- a/src/TutorialCode/Tutorial1C/ChangeLog +++ b/src/TutorialCode/Tutorial1C/ChangeLog @@ -1,3 +1,7 @@ +2010-10-18 + + * Makefile (Makefile.tutorial1C): Removed -makefile qmake option. + 2010-06-25 * tutorial1C.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS. diff --git a/src/TutorialCode/Tutorial1C/Makefile b/src/TutorialCode/Tutorial1C/Makefile --- a/src/TutorialCode/Tutorial1C/Makefile +++ b/src/TutorialCode/Tutorial1C/Makefile @@ -19,7 +19,7 @@ tutorial1C: Makefile.tutorial1C $(MAKE) -f Makefile.tutorial1C Makefile.tutorial1C: tutorial1C.pro - $(QMAKE) -makefile -o $@ $< + $(QMAKE) -o $@ $< clean: $(MAKE) -f Makefile.tutorial1C clean diff --git a/src/TutorialCode/Tutorial1D/ChangeLog b/src/TutorialCode/Tutorial1D/ChangeLog --- a/src/TutorialCode/Tutorial1D/ChangeLog +++ b/src/TutorialCode/Tutorial1D/ChangeLog @@ -1,3 +1,7 @@ +2010-10-18 + + * Makefile (Makefile.tutorial1D): Removed -makefile qmake option. + 2010-06-25 * tutorial1D.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS. diff --git a/src/TutorialCode/Tutorial1D/Makefile b/src/TutorialCode/Tutorial1D/Makefile --- a/src/TutorialCode/Tutorial1D/Makefile +++ b/src/TutorialCode/Tutorial1D/Makefile @@ -19,7 +19,7 @@ tutorial1D: Makefile.tutorial1D $(MAKE) -f Makefile.tutorial1D Makefile.tutorial1D: tutorial1D.pro - $(QMAKE) -makefile -o $@ $< + $(QMAKE) -o $@ $< clean: $(MAKE) -f Makefile.tutorial1D clean diff --git a/src/TutorialCode/Tutorial2/ChangeLog b/src/TutorialCode/Tutorial2/ChangeLog --- a/src/TutorialCode/Tutorial2/ChangeLog +++ b/src/TutorialCode/Tutorial2/ChangeLog @@ -1,3 +1,7 @@ +2010-10-18 + + * Makefile (Makefile.tutorial2): Removed -makefile qmake option. + 2010-06-25 * tutorial2.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS. diff --git a/src/TutorialCode/Tutorial2/Makefile b/src/TutorialCode/Tutorial2/Makefile --- a/src/TutorialCode/Tutorial2/Makefile +++ b/src/TutorialCode/Tutorial2/Makefile @@ -19,7 +19,7 @@ tutorial2: Makefile.tutorial2 $(MAKE) -f Makefile.tutorial2 Makefile.tutorial2: tutorial2.pro - $(QMAKE) -makefile -o $@ $< + $(QMAKE) -o $@ $< clean: $(MAKE) -f Makefile.tutorial2 clean diff --git a/src/TutorialCode/Tutorial3/ChangeLog b/src/TutorialCode/Tutorial3/ChangeLog --- a/src/TutorialCode/Tutorial3/ChangeLog +++ b/src/TutorialCode/Tutorial3/ChangeLog @@ -1,3 +1,7 @@ +2010-10-18 + + * Makefile (Makefile.tutorial3): Removed -makefile qmake option. + 2010-10-14 * tutorial3.h (SimPluginInterface): Added default LeafML file. diff --git a/src/TutorialCode/Tutorial3/Makefile b/src/TutorialCode/Tutorial3/Makefile --- a/src/TutorialCode/Tutorial3/Makefile +++ b/src/TutorialCode/Tutorial3/Makefile @@ -19,7 +19,7 @@ tutorial3: Makefile.tutorial3 $(MAKE) -f Makefile.tutorial3 Makefile.tutorial3: tutorial3.pro - $(QMAKE) -makefile -o $@ $< + $(QMAKE) -o $@ $< clean: $(MAKE) -f Makefile.tutorial3 clean diff --git a/src/TutorialCode/Tutorial4/ChangeLog b/src/TutorialCode/Tutorial4/ChangeLog --- a/src/TutorialCode/Tutorial4/ChangeLog +++ b/src/TutorialCode/Tutorial4/ChangeLog @@ -1,3 +1,7 @@ +2010-10-18 + + * Makefile (Makefile.tutorial4): Removed -makefile qmake option. + 2010-10-14 * tutorial4.h (SimPluginInterface): Added default LeafML file. diff --git a/src/TutorialCode/Tutorial4/Makefile b/src/TutorialCode/Tutorial4/Makefile --- a/src/TutorialCode/Tutorial4/Makefile +++ b/src/TutorialCode/Tutorial4/Makefile @@ -19,7 +19,7 @@ tutorial4: Makefile.tutorial4 $(MAKE) -f Makefile.tutorial4 Makefile.tutorial4: tutorial4.pro - $(QMAKE) -makefile -o $@ $< + $(QMAKE) -o $@ $< clean: $(MAKE) -f Makefile.tutorial4 clean diff --git a/src/TutorialCode/Tutorial5/ChangeLog b/src/TutorialCode/Tutorial5/ChangeLog --- a/src/TutorialCode/Tutorial5/ChangeLog +++ b/src/TutorialCode/Tutorial5/ChangeLog @@ -1,3 +1,7 @@ +2010-10-18 + + * Makefile (Makefile.tutorial5): Removed -makefile qmake option. + 2010-10-14 * tutorial5.h (SimPluginInterface): Added default LeafML file. diff --git a/src/TutorialCode/Tutorial5/Makefile b/src/TutorialCode/Tutorial5/Makefile --- a/src/TutorialCode/Tutorial5/Makefile +++ b/src/TutorialCode/Tutorial5/Makefile @@ -19,7 +19,7 @@ tutorial5: Makefile.tutorial5 $(MAKE) -f Makefile.tutorial5 Makefile.tutorial5: tutorial5.pro - $(QMAKE) -makefile -o $@ $< + $(QMAKE) -o $@ $< clean: $(MAKE) -f Makefile.tutorial5 clean diff --git a/src/VirtualLeaf.pro b/src/VirtualLeaf.pro --- a/src/VirtualLeaf.pro +++ b/src/VirtualLeaf.pro @@ -203,7 +203,7 @@ ICON = leaficon.icns QMAKE_POST_LINK = "\ #install_name_tool -change libqwt.5.dylib $$QWTDIR/lib/libqwt.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}; \ cp leaficon.icns $${DESTDIR}/$${TARGET}.app; \ - cp gpl3.txt $${DESTDIR}/$${TARGET}.app/Contents/MacOS/. ; \ + cp ../doc/gpl3.txt $${DESTDIR}/$${TARGET}.app/Contents/MacOS/. ; \ mkdir $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \ cp -R /Library/Frameworks/QtCore.framework $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \ cp -R /Library/Frameworks/QtGui.framework $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \ diff --git a/src/build_models/ChangeLog b/src/build_models/ChangeLog --- a/src/build_models/ChangeLog +++ b/src/build_models/ChangeLog @@ -1,3 +1,7 @@ +2010-10-18 + + * Makefile (Makefile.plugin_test): Removed -makefile qmake option. + 2010-06-25 * plugin_auxingrowth.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS. diff --git a/src/build_models/Makefile b/src/build_models/Makefile --- a/src/build_models/Makefile +++ b/src/build_models/Makefile @@ -19,19 +19,19 @@ plugin_auxingrowth: Makefile.plugin_auxi $(MAKE) -f Makefile.plugin_auxingrowth Makefile.plugin_auxingrowth: plugin_auxingrowth.pro - $(QMAKE) -makefile -o $@ $< + $(QMAKE) -o $@ $< plugin_meinhardt: Makefile.plugin_meinhardt $(MAKE) -f Makefile.plugin_meinhardt Makefile.plugin_meinhardt: plugin_meinhardt.pro - $(QMAKE) -makefile -o $@ $< + $(QMAKE) -o $@ $< plugin_test: Makefile.plugin_test $(MAKE) -f Makefile.plugin_test Makefile.plugin_test: plugin_test.pro - $(QMAKE) -makefile -o $@ $< + $(QMAKE) -o $@ $< clean: $(MAKE) -f Makefile.plugin_auxingrowth clean