X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=112d8bb58c4bfc9b413501f6c5f76ca5441284d0;hb=78d385b381bca53d5e75927f53f96ce0279a2a23;hp=39a3372d9b4cae59018a4e8fb291241c722838cd;hpb=6023ec6314249b0b7f34e93e2b382111d986352c;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 39a3372..112d8bb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-#################################################################################
+############################################################################
 #
 #			fptools/Makefile
 #
 #		This is the main Makefile for fptools.
 #
-#################################################################################
+############################################################################
 
 TOP=.
 include $(TOP)/mk/boilerplate.mk
@@ -14,50 +14,116 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 # 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 = $@
+CURRENT_TARGET = $(MAKECMDGOALS)
 SUBDIRS = $(shell if (test x$(CURRENT_TARGET) = xinstall) ; then echo $(ProjectsToInstall); else echo $(ProjectsToBuild); fi)
 
+ifneq "$(Project)" ""
+   include $(shell echo $(Project) | tr A-Z a-z)/mk/config.mk
+endif
+
 #
 # Files to include in fptools source distribution
 #
-SRC_DIST_DIRS += mk docs CONTRIB distrib $(ProjectsToBuild)
-SRC_DIST_FILES += configure.in config.guess config.sub configure aclocal.m4 README ANNOUNCE INSTALL Makefile install-sh
+SRC_DIST_DIRS += mk docs distrib $(ProjectsToBuild)
+SRC_DIST_FILES += configure.in config.guess config.sub configure aclocal.m4 acconfig.h README INSTALL Makefile install-sh
 
-#
+# -----------------------------------------------------------------------------
+# Make sure configure is up-to-date
+
+all boot :: 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
 #
-BIN_DIST_TMPDIR=$(shell pwd)
-BIN_DIST_NAME=fptools
+# To make a particular binary distribution: 
+# set $(Project) to the name of the project (currently Ghc or Happy).
+
+BIN_DIST_TMPDIR=$(FPTOOLS_TOP_ABS)
+BIN_DIST_NAME=$(ProjectNameShort)-$(ProjectVersion)
 
 #
-# list of toplevel `projects' to include in binary distrib.
+# list of toplevel directories to include in binary distrib.
 #
-BIN_DIST_DIRS=ghc
+BIN_DIST_MAIN_DIR=$($(Project)MainDir)
+BIN_DIST_DIRS=$($(Project)BinDistDirs)
 
 binary-dist:: binary-dist-pre
 
 BIN_DIST_TOP= distrib/Makefile-bin.in \
 	      distrib/configure-bin.in \
-	      README \
 	      distrib/INSTALL \
-	      ANNOUNCE \
-	      ghc/PATCHLEVEL \
+	      $(BIN_DIST_MAIN_DIR)/ANNOUNCE \
+	      $(BIN_DIST_MAIN_DIR)/VERSION \
+	      $(BIN_DIST_MAIN_DIR)/RELEASE \
+	      $(BIN_DIST_MAIN_DIR)/LICENSE \
+	      $(BIN_DIST_MAIN_DIR)/README \
 	      glafp-utils/mkdirhier/mkdirhier \
-	      ghc/RELEASE \
 	      install-sh \
 	      config.guess \
 	      config.sub   \
 	      aclocal.m4
 
+#
+# binary-dist creates a binary bundle, set BIN_DIST_NAME
+# to package name and do `make binary-dist Project=<project-name>'
+# (normally this just a thing you would do from the toplevel of fptools)
+#
+.PHONY: binary-dist-pre binary-dist binary-pack
+
+BIN_DIST_NAME=$(ProjectNameShort)-$(ProjectVersion)
+BIN_DIST_TMPDIR=$(FPTOOLS_TOP_ABS)
+
+binary-dist-pre::
+	-rm -rf $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)
+	-rm -f $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME).tar.gz
+	@for i in $(BIN_DIST_DIRS); do 		 	 \
+	  if test -d "$$i"; then 			 \
+	   echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM); \
+	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM); \
+	   echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM); \
+	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM); \
+	   echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
+	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
+	   echo $(MAKE) -C $$i $(MFLAGS) install \
+		prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
+		exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
+		bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \
+		libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
+		libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
+		datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
+	   $(MAKE) -C $$i $(MFLAGS) install \
+		prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
+		exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
+		bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \
+		libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
+		libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
+		datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
+	  fi; \
+	done
+
 binary-dist::
 	@for i in $(BIN_DIST_TOP); do \
-	  echo cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); \
-	  cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); \
+	  if test -f "$$i"; then \
+	     echo cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); \
+	     cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); \
+	  fi; \
 	done;
-	@echo "hackily rename some of these chaps.."
-	$(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile-bin.in $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in 
-	$(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure-bin.in $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure.in 
+	@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 )
 
 #
@@ -65,66 +131,78 @@ binary-dist::
 # Which documentation to build/install is hardcoded below.
 #
 
-BINDIST_DOCS = docs ghc/docs/users_guide
-BINDIST_DOCS_WAYS = html info dvi
+BINDIST_DOCS = $($(Project)BinDistDocs)
+BINDIST_DOCS_WAYS = html ps
 
 binary-dist ::
 	@for way in $(BINDIST_DOCS_WAYS); do \
-	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way/$(GhcProjectNameShort)-$(GhcProjectVersion); \
+	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way; \
 	   for dir in $(BINDIST_DOCS); do \
 	     echo Making $$way documentation in $$dir && \
-	     $(MAKE) -C $$dir --no-print-directory $(MFLAGS) $$way && \
-	     echo cp -f $$dir/*.$$way $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way/$(GhcProjectNameShort)-$(GhcProjectVersion) && \
-	     cp -f $$dir/*.$$way $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way/$(GhcProjectNameShort)-$(GhcProjectVersion) && \
+	     $(MAKE) -C $$dir --no-print-directory $(MFLAGS) $$way >.doclog  2>&1 && \
+	     if [ "$$way" = "html" ]; then \
+		for subdir in `perl -n -e '/output will be in ([_\-A-Za-z0-9]*)/ && do { print $$1; };' <.doclog`; do \
+		   echo Copying HTML docs from $$subdir...; \
+		   cp -Rf $$dir/$$subdir $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way; \
+		done \
+	     else \
+	        cp -f $$dir/*.$$way $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way; \
+	     fi && \
 	     echo "Done."; \
 	   done; \
 	done
+	@rm -f .doclog
 
-#
-# binary dist'ing hslibs/, hackily.
-#
-binary-dist ::
-	@echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(GhcProjectVersion)/hslibs;
-	@$(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(GhcProjectVersion)/hslibs;
-	$(MAKE) -C hslibs $(MFLAGS) install \
-		BIN_DIST=1 BIN_DIST_NAME=$(BIN_DIST_NAME) \
-		prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
-		exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
-		bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/ghc-$(GhcProjectVersion) \
-		libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(GhcProjectVersion)/hslibs \
-		libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(GhcProjectVersion)/hslibs \
-		datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/ghc-$(GhcProjectVersion) ;
+# Rename scripts to $i.prl and $i.sh where necessary.
+# ToDo: do this in a cleaner way...
 
-# Even more of a hack, but I'm too tired to fix this up right now..
-BIN_DIST_SCRIPTS_NEEDING_RENAMING=ghc stat2resid hstags mkdependHS
+ifneq "$($(Project)BinDistPrlScripts)" ""
+binary-dist::
+	@for i in $($(Project)BinDistPrlScripts); do \
+	     echo "Renaming $$i to $$i.prl"; \
+	    $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i.prl; \
+	done
+endif
 
+ifneq "$($(Project)BinDistLibPrlScripts)" ""
 binary-dist::
-	@for i in $(BIN_DIST_SCRIPTS_NEEDING_RENAMING); do \
+	@for i in $($(Project)BinDistLibPrlScripts); do \
 	     echo "Renaming $$i to $$i.prl"; \
-	    $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/ghc-$(GhcProjectVersion)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/ghc-$(GhcProjectVersion)/$$i.prl; \
+	    $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i.prl; \
 	done
-	@echo "Renaming hscpp to hscpp.prl"
-	@$(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(GhcProjectVersion)/hscpp  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(GhcProjectVersion)/hscpp.prl
+endif
 
-# binary-disting happy, hackily again
+ifneq "$($(Project)BinDistShScripts)" ""
+binary-dist::
+	@for i in $($(Project)BinDistShScripts); do \
+	     echo "Renaming $$i to $$i.sh"; \
+	    $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i.sh; \
+	done
+endif
 
-binary-dist ::
-	@echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(GhcProjectVersion)/happy;
-	@$(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(GhcProjectVersion)/happy;
-	$(MAKE) -C happy $(MFLAGS) install \
-		BIN_DIST=1 BIN_DIST_NAME=$(BIN_DIST_NAME) \
-		prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
-		exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
-		bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/ghc-$(GhcProjectVersion) \
-		libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(GhcProjectVersion) \
-		libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(GhcProjectVersion) \
-		datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/ghc-$(GhcProjectVersion) ;
-	@echo "Renaming happy to happy.sh"
-	@$(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/ghc-$(GhcProjectVersion)/happy  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/ghc-$(GhcProjectVersion)/happy.sh
+#
+# Do this separately for now
+# 
+binary-pack::
+	( cd $(BIN_DIST_TMPDIR); $(TAR) chzf $(BIN_DIST_NAME).tar.gz $(BIN_DIST_NAME) )
+
+ifneq "$(way)" ""
+package-way-dist::
+	( cd $(BIN_DIST_TMPDIR); find $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print | xargs tar cvf $(BIN_DIST_TMPDIR)/ghc-$(ProjectVersion)-$(way)-$(TARGETPLATFORM).tar )
+	gzip $(BIN_DIST_TMPDIR)/ghc-$(ProjectVersion)-$(way)-$(TARGETPLATFORM).tar
+endif
+
+ifneq "$(way)" ""
+remove-way-dist::
+	( cd $(BIN_DIST_TMPDIR); find $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print -exec rm -f {} \; )
+endif
+
+binary-dist::
+	@echo "Mechanical and super-natty! Inspect the result and *if* happy; freeze, sell and get some sleep!"
+
+# -----------------------------------------------------------------------------
 
 dist :: dist-pre
 include $(TOP)/mk/target.mk
 dist :: dist-post
 
-binary-dist::
-	@echo "Mechanical and super-natty! Inspect the result and *if* happy; freeze, sell and get some sleep!"