Permalink
Browse files

Makefile clean-up

  • Loading branch information...
1 parent f629de3 commit 46571bc65781a8d5df9ddc439454f4d4ad515b91 Johan Tibell committed Apr 9, 2010
Showing with 7 additions and 10 deletions.
  1. +1 −7 benchmarks/Makefile
  2. +0 −3 tests/Makefile
  3. +6 −0 tests/common.mk
View
@@ -47,7 +47,7 @@ simple: $(lib) Args.o Simple.o
ranlib $(lib)
$(ghc) $(ghc-flags) -threaded -o $@ $(filter %.o,$^) $(lib)
-thread-delay: ghc-flags += $(ghc-bench-flags) -package stm
+thread-delay: ghc-flags += -package stm
thread-delay: $(lib) Args.o ThreadDelay.o
ranlib $(lib)
$(ghc) $(ghc-flags) -threaded -o $@ $(filter %.o,$^) $(lib)
@@ -56,15 +56,9 @@ timers: $(lib) Args.o Timers.o
ranlib $(lib)
$(ghc) $(ghc-flags) -threaded -o $@ $(filter %.o,$^) $(lib)
-%.o: %.hs
- $(ghc) $(ghc-flags) $(ghc-opt-flags) -c -o $@ $<
-
%.o: %.c
$(cc) $(cc-opt-flags) -c -o $@ $<
-%.hs: %.hsc
- hsc2hs $<
-
.PHONY: clean
clean:
-find . \( -name '*.o' -o -name '*.hi' \) -exec rm {} \;
View
@@ -13,9 +13,6 @@ tests: $(lib) Array.o Manager.o PSQ.o RunTests.o
ranlib $(lib)
$(ghc) $(ghc-flags) -threaded -o $@ $(filter %.o,$^) $(lib)
-%.o: %.hs
- $(ghc) $(ghc-flags) $(ghc-opt-flags) -c -o $@ $<
-
.PHONY: clean
clean:
-find . \( -name '*.o' -o -name '*.hi' \) -exec rm {} \;
View
@@ -31,3 +31,9 @@ lib-srcs := $(shell grep '^ *System' ../$(package).cabal | \
sed -e 's,\.,/,g' -e 's,$$,.hs,')
cabal := $(shell which cabal 2>/dev/null)
+
+%.o: %.hs
+ $(ghc) $(ghc-flags) $(ghc-opt-flags) -c -o $@ $<
+
+%.hs: %.hsc
+ hsc2hs $<

0 comments on commit 46571bc

Please sign in to comment.