diff options
Diffstat (limited to 'utils/Makefile')
| -rw-r--r-- | utils/Makefile | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/utils/Makefile b/utils/Makefile index a6f5f9af2e..276a736990 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -1,9 +1,9 @@ TOP=.. include $(TOP)/mk/boilerplate.mk -ifeq "$(MAKING_BIN_DIST)" "1" +ifeq "$(DOING_BIN_DIST)" "YES" # 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 @@ -11,17 +11,16 @@ else SUBDIRS = mkdependC mkdirhier runstdtest ghc-pkg hasktags hp2ps hsc2hs \ parallel prof unlit genprimopcode genapply runghc endif +ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" +# lndir doesn't build on Windows +SUBDIRS += lndir +endif endif ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" SUBDIRS += touchy endif -ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" -# lndir doesn't build on Windows -SUBDIRS += lndir -endif - # Utils that we don't build by default: # nofib-analyse @@ -41,6 +40,11 @@ endif # 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 # genprimopcode is needed to boot in ghc/compiler... |