projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
When haddocking, we need the dependencies to have been built
[ghc-hetmet.git]
/
rules
/
build-prog.mk
diff --git
a/rules/build-prog.mk
b/rules/build-prog.mk
index
ebc8990
..
e072907
100644
(file)
--- a/
rules/build-prog.mk
+++ b/
rules/build-prog.mk
@@
-49,14
+49,14
@@
define build-prog-helper
$(call all-target,$1,all_$1_$2)
$(call all-target,$1,all_$1_$2)
-$(call package-config,$1,$2,$3)
-
ifeq "$$($1_USES_CABAL)" "YES"
ifneq "$$(NO_INCLUDE_PKGDATA)" "YES"
include $1/$2/package-data.mk
endif
endif
ifeq "$$($1_USES_CABAL)" "YES"
ifneq "$$(NO_INCLUDE_PKGDATA)" "YES"
include $1/$2/package-data.mk
endif
endif
+$(call package-config,$1,$2,$3)
+
ifeq "$$($1_USES_CABAL)$$($1_$2_VERSION)" "YES"
$1_$2_DISABLE = YES
endif
ifeq "$$($1_USES_CABAL)$$($1_$2_VERSION)" "YES"
$1_$2_DISABLE = YES
endif
@@
-92,7
+92,7
@@
$(call c-sources,$1,$2)
$1_$2_depfile_base = $1/$2/build/.depend
$1_$2_depfile_base = $1/$2/build/.depend
-$(call build-dependencies,$1,$2)
+$(call build-dependencies,$1,$2,$3)
# --- IMPLICIT RULES
# --- IMPLICIT RULES