X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=cb75190245620e3d1559082eca85507965f38465;hb=cd09a67b48427a6d9f30a3d800e9f525dd353ca0;hp=413a260901a0736dd5fe80aac25dacbf7af04328;hpb=769e8c2c3359496f8e4810b8d2e1cc999429da0c;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 413a260..cb75190 100644
--- a/Makefile
+++ b/Makefile
@@ -9,17 +9,24 @@
 TOP=.
 include $(TOP)/mk/boilerplate.mk
 
-#
-# Totally evil hack to make the setting of SUBDIRS be dependent
-# on whether we do `make install' or not. Having a $(ifeq ... ) would
-# be preferable..
-CURRENT_TARGET = $(MAKECMDGOALS)
-SUBDIRS = $(shell if (test x$(CURRENT_TARGET) = xinstall) ; then echo $(ProjectsToInstall); else echo $(ProjectsToBuild); fi)
+# find the projects that actually exist...
+SUBDIRS = $(filter $(patsubst %/, %, $(wildcard */)), $(AllProjects))
+
+# and filter only those that the user requested, if necessary
+ifeq "$(ProjectsToBuild)" ""
+Projects = $(SUBDIRS)
+else
+Projects = $(filter $(ProjectsToBuild), $(SUBDIRS))
+endif
 
 ifneq "$(Project)" ""
    include $(shell echo $(Project) | tr A-Z a-z)/mk/config.mk
 endif
 
+# -----------------------------------------------------------------------------
+# Certain targets require that Project is set from the command line.
+
+CURRENT_TARGET = $(MAKECMDGOALS)
 project-check :
 	@if [ "$(Project)" = "" ]; then \
 		echo "	You need to set \"Project\" in order to make $(CURRENT_TARGET)"; \
@@ -30,7 +37,7 @@ project-check :
 # -----------------------------------------------------------------------------
 # Make sure configure is up-to-date
 
-all boot :: configure
+all install dist binary-dist :: configure
 configure :: configure.in
 	@echo "WARNING: configure needs to be regenerated.  Type"
 	@echo "      make -f Makefile.config ./configure"
@@ -143,6 +150,7 @@ binary-dist::
 	echo "PACKAGE_PRL_SCRIPTS = $($(Project)BinDistPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	echo "PACKAGE_LIB_PRL_SCRIPTS = $($(Project)BinDistLibPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	echo "PACKAGE_BINS = $($(Project)BinDistBins)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+	echo "PACKAGE_LINKS = $($(Project)BinDistLinks)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	cat $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile-bin.in >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	@echo "Generating a shippable configure script.."
 	$(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure-bin.in $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure.in 
@@ -227,8 +235,11 @@ binary-dist::
 #
 # Do it like this: 
 #
-#	$ make boot
+#	$ make
 #	$ make dist Project=Ghc
+#
+# WARNING: `make dist' calls `make distclean' before tarring up the tree.
+#
 
 .PHONY: dist
 
@@ -240,7 +251,7 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 #
 # Files to include in source distributions
 #
-SRC_DIST_DIRS += docs distrib $(ProjectsToBuild)
+SRC_DIST_DIRS += docs distrib $(Projects)
 SRC_DIST_FILES += \
 	configure.in config.guess config.sub configure \
 	aclocal.m4 acconfig.h README Makefile install-sh \
@@ -263,7 +274,7 @@ dist ::
 # Automatic generation of a MANIFEST file for a source distribution
 # tree that is ready to go.
 dist-manifest ::
-	cd $(SRC_DIST_DIR); $(FIND) . \( -type l -o -type f \) -exec ls -lLG {} \; | sed -e 's/\.\///' > /tmp/MANIFEST ; mv /tmp/MANIFEST MANIFEST
+	cd $(SRC_DIST_DIR); $(FIND) . \( -type l -o -type f \) -exec ls -lLG {} \; | sed -e 's/\.\///' > MANIFEST.tmp ; mv MANIFEST.tmp MANIFEST
 
 dist-package :: dist-package-tar-gz
 
@@ -282,5 +293,30 @@ DIST_CLEAN_FILES += config.cache config.status
 
 MAINTAINER_CLEAN_FILES += configure
 
+all ::
+	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
+	for i in $(Projects); do \
+	   if [ -d $$i ]; then \
+	      $(MAKE) -C $$i boot all; \
+	      if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
+	      fi; \
+	done
+
+boot ::
+	@echo "Please use \`make all' only from the top-level, or \`make boot' followed"
+	@echo "by \`make all' in an individual project subdirectory (ghc, hslibs etc.)."
+
+install ::
+	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
+	for i in $(filter-out $(ProjectsDontInstall), $(Projects)); do \
+	   if [ -d $$i ]; then \
+	      $(MAKE) -C $$i install; \
+	      if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
+	      fi; \
+	done
+
+NO_ALL_TARGETS=YES
 include $(TOP)/mk/target.mk
 
+# -----------------------------------------------------------------------------
+