diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-04-20 00:13:46 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-04-20 00:13:46 +0100 |
| commit | 432d1048d1eef85383de609ca7dd346e5b1ec5cb (patch) | |
| tree | 2dcbf15647423429ad19852b49ab024da93dac81 | |
| parent | 561d64a851f1427233c93b6fceb24ef38bf64e70 (diff) | |
| download | haskell-432d1048d1eef85383de609ca7dd346e5b1ec5cb.tar.gz | |
Small build system refactoring
| -rw-r--r-- | ghc.mk | 2 | ||||
| -rw-r--r-- | includes/ghc.mk | 10 |
2 files changed, 6 insertions, 6 deletions
@@ -610,6 +610,7 @@ BUILD_DIRS += driver/ghci BUILD_DIRS += driver/ghc BUILD_DIRS += driver/haddock BUILD_DIRS += libffi +BUILD_DIRS += utils/deriveConstants BUILD_DIRS += includes BUILD_DIRS += rts @@ -652,7 +653,6 @@ BUILD_DIRS += utils/haddock/doc BUILD_DIRS += compiler BUILD_DIRS += utils/hsc2hs BUILD_DIRS += utils/ghc-pkg -BUILD_DIRS += utils/deriveConstants BUILD_DIRS += utils/testremove BUILD_DIRS += $(MAYBE_GHCTAGS) BUILD_DIRS += utils/dll-split diff --git a/includes/ghc.mk b/includes/ghc.mk index 6b92d20837..dd5d62fb70 100644 --- a/includes/ghc.mk +++ b/includes/ghc.mk @@ -158,19 +158,19 @@ ifneq "$(BINDIST)" "YES" $(includes_DERIVEDCONSTANTS): $$(includes_H_CONFIG) $$(includes_H_PLATFORM) $$(includes_H_FILES) $$(rts_H_FILES) $(includes_GHCCONSTANTS_HASKELL_VALUE): $$(includes_H_CONFIG) $$(includes_H_PLATFORM) $$(includes_H_FILES) $$(rts_H_FILES) -$(includes_DERIVEDCONSTANTS): $(INPLACE_BIN)/deriveConstants$(exeext) | $$(dir $$@)/. +$(includes_DERIVEDCONSTANTS): $(deriveConstants_INPLACE) | $$(dir $$@)/. $< --gen-header -o $@ --tmpdir $(dir $@) $(DERIVE_CONSTANTS_FLAGS) -$(includes_GHCCONSTANTS_HASKELL_TYPE): $(INPLACE_BIN)/deriveConstants$(exeext) | $$(dir $$@)/. +$(includes_GHCCONSTANTS_HASKELL_TYPE): $(deriveConstants_INPLACE) | $$(dir $$@)/. $< --gen-haskell-type -o $@ --tmpdir $(dir $@) $(DERIVE_CONSTANTS_FLAGS) -$(includes_GHCCONSTANTS_HASKELL_VALUE): $(INPLACE_BIN)/deriveConstants$(exeext) | $$(dir $$@)/. +$(includes_GHCCONSTANTS_HASKELL_VALUE): $(deriveConstants_INPLACE) | $$(dir $$@)/. $< --gen-haskell-value -o $@ --tmpdir $(dir $@) $(DERIVE_CONSTANTS_FLAGS) -$(includes_GHCCONSTANTS_HASKELL_WRAPPERS): $(INPLACE_BIN)/deriveConstants$(exeext) | $$(dir $$@)/. +$(includes_GHCCONSTANTS_HASKELL_WRAPPERS): $(deriveConstants_INPLACE) | $$(dir $$@)/. $< --gen-haskell-wrappers -o $@ --tmpdir $(dir $@) $(DERIVE_CONSTANTS_FLAGS) -$(includes_GHCCONSTANTS_HASKELL_EXPORTS): $(INPLACE_BIN)/deriveConstants$(exeext) | $$(dir $$@)/. +$(includes_GHCCONSTANTS_HASKELL_EXPORTS): $(deriveConstants_INPLACE) | $$(dir $$@)/. $< --gen-haskell-exports -o $@ --tmpdir $(dir $@) $(DERIVE_CONSTANTS_FLAGS) endif |