Commit graph

6 commits

Author SHA1 Message Date
Henrik Brautaset Aronsen
b495c298e3 Remove trailing spaces from config.cache file
Things like «ifeq ($(UNAME), darwin)» would not trigger, since variables
in the config.cache files had trailing spaces.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-04-23 14:04:24 -07:00
Henrik Brautaset Aronsen
6a3ccaea35 Fix config.cache creation on a Mac
Mac uses BSD sed by default, which doesn't support \n substition
by default.  Replacing sed with tr.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-04-23 12:31:15 -07:00
Thiago Macieira
b1c9ed76dc Cache the Qt tools detected (and detect RCC)
Since we're caching the include flags and linker flags, we should also
cache the exact helper binaries we're running. This avoids getting
errors because the environment changed.

Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-23 00:06:32 -07:00
Thiago Macieira
c11ce7e157 Introduce a cache of the configuration
You may have noticed that running make is a little slow. Every time
that it is loaded, it will try to detect everything again. So,
instead, save the output and reload it the next time.

This is implemented by adding a rule that (re-)creates the
config.cache file, which is included by make. If the file doesn't
exist yet, make will first run the rule which creates it, then reload
itself.

You can also cause it to reconfigure by running "make configure".

Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-23 00:06:32 -07:00
Thiago Macieira
d47b904580 Trim Makefile, Configure.mk and Rules.mk
Configure.mk contains the detection rules, whereas Rules.mk contains
the rules to actually build Subsurface. This simplifies Makefile
greatly, which is the file that should be actually modified during
regular updates to the codebase.

Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-04-23 00:06:32 -07:00
Thiago Macieira
f6d133f387 Create Rules.mk and Configure.mk by copying the Makefile
This is to help Git know that the two files are the same content as
the Makefile. The next commit will trim the files to what they need to
be.
2013-04-23 00:06:32 -07:00