summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-08-07 13:25:06 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-08-07 13:25:06 -0400
commita66e1f68caeb045dc0c81388076915f5f06bddec (patch)
tree187fd84f8eda38ebc10b493800785f014514241c
parentc08ce66427cca9ba310f15217340734e6a34e1a8 (diff)
remove template haskell file touching
too annoying
-rw-r--r--Makefile9
1 files changed, 1 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index da28edfc8..89deedd65 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,6 @@ FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP
bins=git-annex
mans=git-annex.1 git-annex-shell.1
sources=Build/SysConfig.hs Utility/Touch.hs Utility/Mounts.hs
-thfiles=Assistant/Threads/WebApp.hs $(shell find Assistant/WebApp*)
all=$(bins) $(mans) docs
OS:=$(shell uname | sed 's/[-_].*//')
@@ -57,13 +56,7 @@ Build/SysConfig.hs: configure.hs Build/TestConfig.hs Build/Configure.hs
%.hs: %.hsc
hsc2hs $<
-# Force GHC to rebuild template haskell files whenever includes
-# change
-$(thfiles): $(shell find templates static)
-$(thfiles):
- touch $(thfiles)
-
-git-annex: $(sources) $(clibs) $(thfiles)
+git-annex: $(sources) $(clibs)
install -d $(GIT_ANNEX_TMP_BUILD_DIR)
$(GHCMAKE) $@ -o $(GIT_ANNEX_TMP_BUILD_DIR)/git-annex $(clibs)
ln -sf $(GIT_ANNEX_TMP_BUILD_DIR)/git-annex git-annex