aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-04-09 12:52:10 (GMT)
committerMathias Gumz <mathias gumz at gmail com>2011-04-18 06:50:44 (GMT)
commit86c9b100f3e27f5b3136f4a1d37b703306e7ddd9 (patch)
tree270a0a0f2d37f29cc80676632085707ffce7cd97 /src
parent8b6943ab1c3862d217e89e1c91582c905c71fbd0 (diff)
downloadfluxbox-86c9b100f3e27f5b3136f4a1d37b703306e7ddd9.zip
fluxbox-86c9b100f3e27f5b3136f4a1d37b703306e7ddd9.tar.bz2
Fix VPATH builds
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am3
-rw-r--r--src/tests/Makefile.am2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 38182c5..e60f9b4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -58,6 +58,7 @@ defaults.hh: Makefile
58 58
59defaults.cc: force 59defaults.cc: force
60 @( \ 60 @( \
61 GITDIR=$(top_srcdir)/.git; \
61 echo '#include "defaults.hh"'; \ 62 echo '#include "defaults.hh"'; \
62 echo ''; \ 63 echo ''; \
63 echo 'std::string realProgramName(const std::string& name) {'; \ 64 echo 'std::string realProgramName(const std::string& name) {'; \
@@ -65,7 +66,7 @@ defaults.cc: force
65 echo '}'; \ 66 echo '}'; \
66 echo ''; \ 67 echo ''; \
67 echo 'const char* gitrevision() {'; \ 68 echo 'const char* gitrevision() {'; \
68 echo ' return "'`cat ../.git/$$(cat ../.git/HEAD | cut -f 2 -d ' ')`'";';\ 69 echo ' return "'`cat $$GITDIR/$$(cat $$GITDIR/HEAD | cut -f 2 -d ' ')`'";';\
69 echo '}' ) > defaults_tmp.cc 70 echo '}' ) > defaults_tmp.cc
70 @if ! cmp defaults_tmp.cc defaults.cc ; then cp defaults_tmp.cc defaults.cc; fi 71 @if ! cmp defaults_tmp.cc defaults.cc ; then cp defaults_tmp.cc defaults.cc; fi
71 @rm defaults_tmp.cc 72 @rm defaults_tmp.cc
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 1b82135..53e1ddc 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,4 +1,4 @@
1INCLUDES= -I.. 1INCLUDES= -I$(top_srcdir)/src
2 2
3noinst_PROGRAMS= \ 3noinst_PROGRAMS= \
4 testTexture \ 4 testTexture \