# HG changeset patch # User Michael Guravage # Date 2010-06-22 17:04:57 # Node ID 23dfaeaae8f83b22afb4676f465dae1c9c1abb3d # Parent 21afbd2a2c01011eb34723aa180c9020d4dd5e44 The value of QMAKE is taken from the environment - just like MAKE. -- user: Michael Guravage branch 'default' changed src/Makefile changed src/TutorialCode/Tutorial0/Makefile changed src/TutorialCode/Tutorial1A/Makefile changed src/TutorialCode/Tutorial1B/Makefile changed src/TutorialCode/Tutorial1C/Makefile changed src/TutorialCode/Tutorial1D/Makefile changed src/TutorialCode/Tutorial2/Makefile changed src/TutorialCode/Tutorial3/Makefile changed src/TutorialCode/Tutorial4/Makefile changed src/TutorialCode/Tutorial5/Makefile changed src/build_models/Makefile diff --git a/src/Makefile b/src/Makefile --- a/src/Makefile +++ b/src/Makefile @@ -1,7 +1,5 @@ # $Id$ -QMAKE = $(HOME)/Trolltech/Qt-4.4.1/bin/qmake - # Set an environment varible $(MAKE) to the name of the make command # on your machine, e.g. 'make' on UNIX and 'mingw32-make' on windows. # Fallback default is UNIX make. @@ -10,6 +8,11 @@ ifeq ($(MAKE),) MAKE=make endif +# Ditto for QMAKE +ifeq ($(QMAKE),) + QMAKE=qmake +endif + all: VirtualLeaf libplugin plugins tutorials VirtualLeaf: Makefile.VirtualLeaf diff --git a/src/TutorialCode/Tutorial0/Makefile b/src/TutorialCode/Tutorial0/Makefile --- a/src/TutorialCode/Tutorial0/Makefile +++ b/src/TutorialCode/Tutorial0/Makefile @@ -1,7 +1,5 @@ # $Id$ -QMAKE = qmake - # Set an environment varible $(MAKE) to the name of the make command # on your machine, e.g. 'make' on UNIX and 'mingw32-make' on windows. # Fallback default is UNIX make. @@ -10,6 +8,11 @@ ifeq ($(MAKE),) MAKE=make endif +# Ditto for QMAKE +ifeq ($(QMAKE),) + QMAKE=qmake +endif + all: tutorial0 tutorial0: Makefile.tutorial0 diff --git a/src/TutorialCode/Tutorial1A/Makefile b/src/TutorialCode/Tutorial1A/Makefile --- a/src/TutorialCode/Tutorial1A/Makefile +++ b/src/TutorialCode/Tutorial1A/Makefile @@ -1,7 +1,5 @@ # $Id$ -QMAKE = qmake - # Set an environment varible $(MAKE) to the name of the make command # on your machine, e.g. 'make' on UNIX and 'mingw32-make' on windows. # Fallback default is UNIX make. @@ -10,6 +8,11 @@ ifeq ($(MAKE),) MAKE=make endif +# Ditto for QMAKE +ifeq ($(QMAKE),) + QMAKE=qmake +endif + all: tutorial1A tutorial1A: Makefile.tutorial1A diff --git a/src/TutorialCode/Tutorial1B/Makefile b/src/TutorialCode/Tutorial1B/Makefile --- a/src/TutorialCode/Tutorial1B/Makefile +++ b/src/TutorialCode/Tutorial1B/Makefile @@ -1,15 +1,18 @@ # $Id$ -QMAKE = qmake - # Set an environment varible $(MAKE) to the name of the make command # on your machine, e.g. 'make' on UNIX and 'mingw32-make' on windows. -# Fallback default is UNIX make. +# Fallback default is UNIX make. ifeq ($(MAKE),) MAKE=make endif +# Ditto for QMAKE +ifeq ($(QMAKE),) + QMAKE=qmake +endif + all: tutorial1B tutorial1B: Makefile.tutorial1B diff --git a/src/TutorialCode/Tutorial1C/Makefile b/src/TutorialCode/Tutorial1C/Makefile --- a/src/TutorialCode/Tutorial1C/Makefile +++ b/src/TutorialCode/Tutorial1C/Makefile @@ -1,7 +1,5 @@ # $Id$ -QMAKE = qmake - # Set an environment varible $(MAKE) to the name of the make command # on your machine, e.g. 'make' on UNIX and 'mingw32-make' on windows. # Fallback default is UNIX make. @@ -10,6 +8,11 @@ ifeq ($(MAKE),) MAKE=make endif +# Ditto for QMAKE +ifeq ($(QMAKE),) + QMAKE=qmake +endif + all: tutorial1C tutorial1C: Makefile.tutorial1C diff --git a/src/TutorialCode/Tutorial1D/Makefile b/src/TutorialCode/Tutorial1D/Makefile --- a/src/TutorialCode/Tutorial1D/Makefile +++ b/src/TutorialCode/Tutorial1D/Makefile @@ -1,7 +1,5 @@ # $Id$ -QMAKE = qmake - # Set an environment varible $(MAKE) to the name of the make command # on your machine, e.g. 'make' on UNIX and 'mingw32-make' on windows. # Fallback default is UNIX make. @@ -10,6 +8,11 @@ ifeq ($(MAKE),) MAKE=make endif +# Ditto for QMAKE +ifeq ($(QMAKE),) + QMAKE=qmake +endif + all: tutorial1D tutorial1D: Makefile.tutorial1D diff --git a/src/TutorialCode/Tutorial2/Makefile b/src/TutorialCode/Tutorial2/Makefile --- a/src/TutorialCode/Tutorial2/Makefile +++ b/src/TutorialCode/Tutorial2/Makefile @@ -1,7 +1,5 @@ # $Id$ -QMAKE = qmake - # Set an environment varible $(MAKE) to the name of the make command # on your machine, e.g. 'make' on UNIX and 'mingw32-make' on windows. # Fallback default is UNIX make. @@ -10,6 +8,11 @@ ifeq ($(MAKE),) MAKE=make endif +# Ditto for QMAKE +ifeq ($(QMAKE),) + QMAKE=qmake +endif + all: tutorial2 tutorial2: Makefile.tutorial2 diff --git a/src/TutorialCode/Tutorial3/Makefile b/src/TutorialCode/Tutorial3/Makefile --- a/src/TutorialCode/Tutorial3/Makefile +++ b/src/TutorialCode/Tutorial3/Makefile @@ -1,7 +1,5 @@ # $Id$ -QMAKE = qmake - # Set an environment varible $(MAKE) to the name of the make command # on your machine, e.g. 'make' on UNIX and 'mingw32-make' on windows. # Fallback default is UNIX make. @@ -10,6 +8,11 @@ ifeq ($(MAKE),) MAKE=make endif +# Ditto for QMAKE +ifeq ($(QMAKE),) + QMAKE=qmake +endif + all: tutorial3 tutorial3: Makefile.tutorial3 diff --git a/src/TutorialCode/Tutorial4/Makefile b/src/TutorialCode/Tutorial4/Makefile --- a/src/TutorialCode/Tutorial4/Makefile +++ b/src/TutorialCode/Tutorial4/Makefile @@ -1,7 +1,5 @@ # $Id$ -QMAKE = qmake - # Set an environment varible $(MAKE) to the name of the make command # on your machine, e.g. 'make' on UNIX and 'mingw32-make' on windows. # Fallback default is UNIX make. @@ -10,6 +8,11 @@ ifeq ($(MAKE),) MAKE=make endif +# Ditto for QMAKE +ifeq ($(QMAKE),) + QMAKE=qmake +endif + all: tutorial4 tutorial4: Makefile.tutorial4 diff --git a/src/TutorialCode/Tutorial5/Makefile b/src/TutorialCode/Tutorial5/Makefile --- a/src/TutorialCode/Tutorial5/Makefile +++ b/src/TutorialCode/Tutorial5/Makefile @@ -1,7 +1,5 @@ # $Id$ -QMAKE = qmake - # Set an environment varible $(MAKE) to the name of the make command # on your machine, e.g. 'make' on UNIX and 'mingw32-make' on windows. # Fallback default is UNIX make. @@ -10,6 +8,11 @@ ifeq ($(MAKE),) MAKE=make endif +# Ditto for QMAKE +ifeq ($(QMAKE),) + QMAKE=qmake +endif + all: tutorial5 tutorial5: Makefile.tutorial5 diff --git a/src/build_models/Makefile b/src/build_models/Makefile --- a/src/build_models/Makefile +++ b/src/build_models/Makefile @@ -1,7 +1,5 @@ # $Id$ -QMAKE = $(HOME)/Trolltech/Qt-4.4.1/bin/qmake - # Set an environment varible $(MAKE) to the name of the make command # on your machine, e.g. 'make' on UNIX and 'mingw32-make' on windows. # Fallback default is UNIX make. @@ -10,6 +8,11 @@ ifeq ($(MAKE),) MAKE=make endif +# Ditto for QMAKE +ifeq ($(QMAKE),) + QMAKE=qmake +endif + all: plugin_auxingrowth plugin_meinhardt plugin_test plugin_auxingrowth: Makefile.plugin_auxingrowth