X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=5fc80ebd9afedaabfdc885889fba806e8167f03c;hb=c57d9ab39c887454a365a3e552a7fa6006a773dd;hp=0c93680467824a69a7a00cf24ad43adc3a1a6ddb;hpb=3f3e085e8a061ac11ec80a8c455fed952e3fdaec;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 0c93680..5fc80eb 100644
--- a/Makefile
+++ b/Makefile
@@ -9,26 +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)
-
 # find the projects that actually exist...
-SUBDIRS = $(filter $(patsubst %/, %, $(wildcard */)), $(AllProjects))
+ProjectsThatExist = $(filter $(patsubst %/, %, $(wildcard */)), $(AllProjects))
 
 # and filter only those that the user requested, if necessary
 ifeq "$(ProjectsToBuild)" ""
-Projects = $(SUBDIRS)
+SUBDIRS = $(ProjectsThatExist)
 else
-Projects = $(filter $(ProjectsToBuild), $(SUBDIRS))
+SUBDIRS = $(filter $(ProjectsToBuild), $(ProjectsThatExist))
 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)"; \
@@ -37,16 +35,6 @@ project-check :
 	fi
 
 # -----------------------------------------------------------------------------
-# Make sure configure is up-to-date
-
-all install dist binary-dist :: configure
-configure :: configure.in
-	@echo "WARNING: configure needs to be regenerated.  Type"
-	@echo "      make -f Makefile.config ./configure"
-	@echo "and rerun make."
-	@exit 16
-
-# -----------------------------------------------------------------------------
 # Making a binary distribution
 #
 # To make a particular binary distribution: 
@@ -144,19 +132,27 @@ binary-dist::
 	     cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); \
 	  fi; \
 	done;
-#	@echo "Configuring the Makefile for this project..."
-#	touch $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-#	echo "package = $(ProjectNameShort)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-#	echo "version = $(ProjectVersion)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-#	echo "PACKAGE_SH_SCRIPTS = $($(Project)BinDistShScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-#	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
-#	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 
-#	( cd $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); autoconf )
-
+	@echo "Configuring the Makefile for this project..."
+	touch $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+	echo "package = $(ProjectNameShort)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+	echo "version = $(ProjectVersion)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+	echo "PACKAGE_SH_SCRIPTS = $($(Project)BinDistShScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+	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 
+	( cd $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); autoconf )
+	if test -x $(BIN_DIST_MAIN_DIR)/mk/post-install-script ; then \
+		cp $(BIN_DIST_MAIN_DIR)/mk/post-install-script \
+			$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) ; \
+	fi
+	if test -x $(BIN_DIST_MAIN_DIR)/mk/post-inplace-script ; then \
+		cp $(BIN_DIST_MAIN_DIR)/mk/post-inplace-script \
+			$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) ; \
+	fi
 #
 # binary dist'ing the documentation.  
 # Which documentation to build/install is hardcoded below.
@@ -165,6 +161,7 @@ binary-dist::
 BINDIST_DOCS = $($(Project)BinDistDocs)
 BINDIST_DOCS_WAYS = html ps
 
+ifeq "$(HOSTPLATFORM)" "i386-unknown-linux"
 binary-dist ::
 	@for way in $(BINDIST_DOCS_WAYS); do \
 	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way; \
@@ -183,6 +180,7 @@ binary-dist ::
 	   done; \
 	done
 	@rm -f .doclog
+endif
 
 # Rename scripts to $i.prl and $i.sh where necessary.
 # ToDo: do this in a cleaner way...
@@ -252,10 +250,11 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 #
 # Files to include in source distributions
 #
-SRC_DIST_DIRS += docs distrib $(Projects)
+SRC_DIST_DIRS += docs distrib $(SUBDIRS)
 SRC_DIST_FILES += \
 	configure.in config.guess config.sub configure \
-	aclocal.m4 acconfig.h README Makefile install-sh \
+	aclocal.m4 acconfig.h README Makefile Makefile.config install-sh \
+	mk/bootstrap.mk \
 	mk/boilerplate.mk mk/config.h.in mk/config.mk.in mk/opts.mk \
 	mk/paths.mk mk/suffix.mk mk/target.mk
 
@@ -289,14 +288,32 @@ dist-package-zip ::
 	       $(ZIP) $(ZIP_OPTS) -r $(SRC_DIST_NAME)-src.zip $(SRC_DIST_PATHS)
 
 # -----------------------------------------------------------------------------
+# HC file bundles
+
+hc-file-bundle : project-check
+	$(RM) $(ProjectNameShort)-$(ProjectVersion)
+	$(LN_S) . $(ProjectNameShort)-$(ProjectVersion)
+	find $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler \
+	     $(ProjectNameShort)-$(ProjectVersion)/ghc/driver \
+	     $(ProjectNameShort)-$(ProjectVersion)/ghc/lib \
+	     $(ProjectNameShort)-$(ProjectVersion)/hslibs \
+	  -name "*.hc" -o -name "*_hsc.[ch]" -o -name "*_stub.[ch]" > hc-files-to-go
+	find $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler \
+	     $(ProjectNameShort)-$(ProjectVersion)/ghc/driver \
+	     $(ProjectNameShort)-$(ProjectVersion)/ghc/lib \
+	     $(ProjectNameShort)-$(ProjectVersion)/hslibs \
+	  -name "*.hsc" | sed 's/hsc$/hs$/g' >> hc-files-to-go
+	tar czf $(ProjectNameShort)-$(ProjectVersion)-$(TARGETPLATFORM)-hc.tar.gz `cat hc-files-to-go`
+
+CLEAN_FILES += hc-files-to-go *-hc.tar.gz
 
-DIST_CLEAN_FILES += config.cache config.status
+# -----------------------------------------------------------------------------
 
-MAINTAINER_CLEAN_FILES += configure
+DIST_CLEAN_FILES += config.cache config.status
 
 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 \
+	for i in $(SUBDIRS); 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; \
@@ -309,7 +326,7 @@ boot ::
 
 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 \
+	for i in $(filter-out $(ProjectsDontInstall), $(SUBDIRS)); do \
 	   if [ -d $$i ]; then \
 	      $(MAKE) -C $$i install; \
 	      if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \