projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
default_target should be "all", not "build"
[ghc-hetmet.git]
/
utils
/
Makefile
diff --git
a/utils/Makefile
b/utils/Makefile
index
b4a7ba1
..
276a736
100644
(file)
--- a/
utils/Makefile
+++ b/
utils/Makefile
@@
-1,9
+1,9
@@
TOP=..
include $(TOP)/mk/boilerplate.mk
TOP=..
include $(TOP)/mk/boilerplate.mk
-ifneq "$(BIN_DIST_NAME)" ""
+ifeq "$(DOING_BIN_DIST)" "YES"
# We're doing a binary-dist, descend into a subset of the dirs.
# We're doing a binary-dist, descend into a subset of the dirs.
-SUBDIRS = hp2ps unlit
+SUBDIRS = mkdirhier ghc-pkg hasktags hp2ps hsc2hs parallel prof unlit runghc
else
ifeq "$(BootingFromHc)" "YES"
SUBDIRS = mkdependC mkdirhier runstdtest genapply genprimopcode ghc-pkg unlit
else
ifeq "$(BootingFromHc)" "YES"
SUBDIRS = mkdependC mkdirhier runstdtest genapply genprimopcode ghc-pkg unlit
@@
-11,17
+11,15
@@
else
SUBDIRS = mkdependC mkdirhier runstdtest ghc-pkg hasktags hp2ps hsc2hs \
parallel prof unlit genprimopcode genapply runghc
endif
SUBDIRS = mkdependC mkdirhier runstdtest ghc-pkg hasktags hp2ps hsc2hs \
parallel prof unlit genprimopcode genapply runghc
endif
-endif
-
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-SUBDIRS += touchy
-endif
-
ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
# lndir doesn't build on Windows
SUBDIRS += lndir
endif
ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
# lndir doesn't build on Windows
SUBDIRS += lndir
endif
+endif
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+SUBDIRS += touchy
+endif
# Utils that we don't build by default:
# nofib-analyse
# Utils that we don't build by default:
# nofib-analyse
@@
-42,4
+40,16
@@
endif
# unlikely to want it desperately. It is easy to build once you have
# a Haskell compiler and if you want it.
# unlikely to want it desperately. It is easy to build once you have
# a Haskell compiler and if you want it.
+binary-dist:
+ $(INSTALL_DIR) $(BIN_DIST_DIR)/utils
+ $(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/utils/
+ set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d binary-dist; done
+
include $(TOP)/mk/target.mk
include $(TOP)/mk/target.mk
+
+# genprimopcode is needed to boot in ghc/compiler...
+ifneq "$(BootingFromHc)" "YES"
+boot ::
+ $(MAKE) -C genprimopcode
+endif
+