projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes for the new IO library, mainly base-package modules moving around
[ghc-hetmet.git]
/
rules
/
build-package.mk
diff --git
a/rules/build-package.mk
b/rules/build-package.mk
index
863dc73
..
67d1831
100644
(file)
--- a/
rules/build-package.mk
+++ b/
rules/build-package.mk
@@
-28,8
+28,6
@@
# libraries/base_dist_CC_OPTS = -Iinclude ...
# libraries/base_dist_LD_OPTS = -package ghc-prim-0.1.0.0
# libraries/base_dist_CC_OPTS = -Iinclude ...
# libraries/base_dist_LD_OPTS = -package ghc-prim-0.1.0.0
-# TODO: soext
-
define build-package
# $1 = dir
# $2 = distdir
define build-package
# $1 = dir
# $2 = distdir
@@
-41,18
+39,24
@@
endif
# We don't install things compiled by stage 0, so no need to put them
# in the bindist.
# We don't install things compiled by stage 0, so no need to put them
# in the bindist.
-ifneq "$(BINDIST) $3" "YES 0"
+ifneq "$$(BINDIST) $3" "YES 0"
$(call all-target,$1,all_$1_$2)
$(call all-target,$1,all_$1_$2)
-
$(call clean-target,$1,$2,$1/$2)
$(call clean-target,$1,$2,$1/$2)
+# This give us things like
+# all_libraries: all_libraries/base_dist-install
+ifneq "$$($1_$2_GROUP)" ""
+all_$$($1_$2_GROUP): all_$1_$2
+endif
distclean : clean_$1_$2_config
distclean : clean_$1_$2_config
+maintainer-clean : distclean
+
.PHONY: clean_$1_$2_config
clean_$1_$2_config:
.PHONY: clean_$1_$2_config
clean_$1_$2_config:
- $(RM) $1/config.log $1/config.status $1/include/Hs*Config.h
- $(RM) -r $1/autom4te.cache
+ "$$(RM)" $$(RM_OPTS) $1/config.log $1/config.status $1/include/Hs*Config.h
+ "$$(RM)" $$(RM_OPTS) -r $1/autom4te.cache
# --- CONFIGURATION
# --- CONFIGURATION
@@
-74,7
+78,7
@@
endif
$(call all-target,$1_$2,$1/$2/package-data.mk)
$(call all-target,$1_$2,$1/$2/package-data.mk)
-ifneq "$(BINDIST)" "YES"
+ifneq "$$(BINDIST)" "YES"
# We have a rule for package-data.mk only when the package is
# disabled, because we want the build to fail if we haven't run phase 0.
$(call build-package-data,$1,$2)
# We have a rule for package-data.mk only when the package is
# disabled, because we want the build to fail if we haven't run phase 0.
$(call build-package-data,$1,$2)
@@
-123,10
+127,14
@@
$1_$2_SplitObjs = NO
endif
endif
endif
endif
-# C and S files are built the "v" vanlilla way
+# C and S files are built the "v" vanlilla way and possibly also the "dyn" way.
$(call c-objs,$1,$2,v)
$(call distdir-opts,$1,$2,$3)
$(call c-suffix-rules,$1,$2,v,YES)
$(call c-objs,$1,$2,v)
$(call distdir-opts,$1,$2,$3)
$(call c-suffix-rules,$1,$2,v,YES)
+ifeq "$(BuildSharedLibs)" "YES"
+$(call c-objs,$1,$2,dyn)
+$(call c-suffix-rules,$1,$2,dyn,YES)
+endif
# Now generate all the build rules for each way in this directory:
$$(foreach way,$$($1_$2_WAYS),$$(eval $$(call build-package-way,$1,$2,$$(way),$3)))
# Now generate all the build rules for each way in this directory:
$$(foreach way,$$($1_$2_WAYS),$$(eval $$(call build-package-way,$1,$2,$$(way),$3)))
@@
-136,7
+144,7
@@
$(call haddock,$1,$2)
endif # package-data.mk exists
# Don't put bootstrapping packages in the bindist
endif # package-data.mk exists
# Don't put bootstrapping packages in the bindist
-ifeq "$3" "1"
+ifneq "$3" "0"
BINDIST_EXTRAS += $1/*.cabal $1/$2/setup-config $1/LICENSE
BINDIST_EXTRAS += $$($1_$2_INSTALL_INCLUDES_SRCS)
endif
BINDIST_EXTRAS += $1/*.cabal $1/$2/setup-config $1/LICENSE
BINDIST_EXTRAS += $$($1_$2_INSTALL_INCLUDES_SRCS)
endif