X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=5c4baa27a2058795438e20fa94bd2ffc7ee46b9c;hb=23c94851fb2c98d345d913d35a5a12bbc3a346bd;hp=09356fd6084c6d4a5169b12724c46bb0108cad14;hpb=e103630d2858bbfffffe1f846b44f7aaac0e9961;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 09356fd..5c4baa2 100644
--- a/Makefile
+++ b/Makefile
@@ -10,127 +10,115 @@ TOP=.
 include $(TOP)/mk/boilerplate.mk
 SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 
-SUBDIRS = $(ProjectsToBuild)
+#
+# 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 = $@
+SUBDIRS = $(shell if (test x$(CURRENT_TARGET) = xinstall) ; then echo $(ProjectsToInstall); else echo $(ProjectsToBuild); fi)
 
 #
 # Files to include in fptools source distribution
 #
-SRC_DIST_DIRS += mk $(ProjectsToBuild)
-SRC_DIST_FILES += configure.in config.guess config.sub configure README ANNOUNCE NEWS INSTALL Makefile
-
+SRC_DIST_DIRS += mk docs CONTRIB distrib $(ProjectsToBuild)
+SRC_DIST_FILES += configure.in config.guess config.sub configure aclocal.m4 README INSTALL Makefile install-sh
 
 #
 # Making a binary distribution
 #
+# To make a particular binary distribution: 
+# set $(Project) to the name of the project (currently Ghc or Happy).
+
 BIN_DIST_TMPDIR=$(shell pwd)
 BIN_DIST_NAME=fptools
 
 #
-# 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 \
-	      distrib/README \
+	      README \
 	      distrib/INSTALL \
-	      distrib/ANNOUNCE \
-	      distrib/PATCHLEVEL \
+	      $(BIN_DIST_MAIN_DIR)/ANNOUNCE \
+	      $(BIN_DIST_MAIN_DIR)/PATCHLEVEL \
+	      $(BIN_DIST_MAIN_DIR)/RELEASE \
 	      glafp-utils/mkdirhier/mkdirhier \
-	      ghc/RELEASE \
 	      install-sh \
 	      config.guess \
-	      config.sub
+	      config.sub   \
+	      aclocal.m4
 
 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.."
-	-(cd $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); autoconf )
+	$(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 )
 
 #
-# Creating and copying the documentation into the bin-dist tree.
-# (this tries to be oh-so-general about copyng docs, but isn't really
-# suited for anything else than ghc/)
+# binary dist'ing the documentation.  
+# Which documentation to build/install is hardcoded below.
 #
-# Needless to say, the rule below could be cleaned up somewhat.
-#
-binary-dist::
-	@$(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/ghc-2.02
-	@$(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/ghc-2.02
-	@$(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/ghc-2.02
-	@echo "Making html documentation.."
-	@echo "For fptools.."
-	#$(MAKE) -C docs --no-print-directory $(MFLAGS) html
-	#cp -f docs/html/* docs/*.html $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/ghc-2.02
-	#@echo "Done."
-	#@for i in $(BIN_DIST_DIRS); do \
-	#   echo "For $$i.."; \
-	#   echo cp -f $$i/docs/users_guide/html/* $$i/docs/users_guide/*.html $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/ghc-2.02; \
-	#   cp -f $$i/docs/users_guide/html/* $$i/docs/users_guide/*.html $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/ghc-2.02; \
-	#   echo cp -f $$i/docs/html/* $$i/docs/*.html $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/ghc-2.02; \
-	#   cp -f $$i/docs/html/* $$i/docs/*.html $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/ghc-2.02; \
-	#   echo "Done."; \
-	#done
-	##@echo "Making dvi files.."
-	#@echo "For fptools.."
-	#-$(MAKE) -C docs --no-print-directory $(MFLAGS) dvi
-	#-cp -f docs/*.dvi  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/ghc-2.02
-	#@echo "Done."
-	#@for i in $(BIN_DIST_DIRS); do \
-	#   echo "For $$i.."; \
-	#   echo cp -f $$i/docs/users_guide/*.dvi $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/ghc-2.02; \
-	#   cp -f $$i/docs/users_guide/*.dvi $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/ghc-2.02; \
-	#   echo cp -f $$i/docs/*.dvi $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/ghc-2.02; \
-	#   cp -f $$i/docs/*.dvi $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/ghc-2.02; \
-	#   echo "Done."; \
-	#done
-	#@echo "Making info files.."
-	#@echo "For fptools.."
-	#-$(MAKE) -C docs --no-print-directory $(MFLAGS) info
-	#-cp -f docs/*.info $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/ghc-2.02/
-	#@echo "Done."
-	#@for i in $(BIN_DIST_DIRS); do \
-	#   echo "For $$i docs.."; \
-	#   echo cp -f $$i/docs/users_guide/*.info  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/ghc-2.02; \
-	#   cp -f $$i/docs/users_guide/*.info $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/ghc-2.02; \
-	#   echo cp -f $$i/docs/*.info $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/ghc-2.02; \
-	#   cp -f $$i/docs/*.info $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/ghc-2.02; \
-	#   echo "Done."; \
-	#done
 
-#
-# binary dist'ing hslibs/, hackily.
-#
+BINDIST_DOCS = $($(Project)BinDistDocs)
+BINDIST_DOCS_WAYS = html info dvi
+
 binary-dist ::
-	@echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/hslibs;
-	@$(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/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-$(ProjectVersion) \
-		libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/hslibs \
-		libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/hslibs \
-		datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$$i-$(ProjectVersion) ;
-
-# 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
+	@for way in $(BINDIST_DOCS_WAYS); do \
+	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way/$(ProjectNameShort)-$(ProjectVersion); \
+	   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/$(ProjectNameShort)-$(ProjectVersion) && \
+	     cp -f $$dir/*.$$way $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way/$(ProjectNameShort)-$(ProjectVersion) && \
+	     echo "Done."; \
+	   done; \
+	done
+
+# Rename scripts to $i.prl and $i.sh where necessary.
+# ToDo: do this in a cleaner way...
 
+ifneq "$($(Project)BinDistPrlScripts)" ""
 binary-dist::
-	@for i in $(BIN_DIST_SCRIPTS_NEEDING_RENAMING); do \
+	@for i in $($(Project)BinDistPrlScripts); do \
 	     echo "Renaming $$i to $$i.prl"; \
-	    $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/$$i.prl; \
+	    $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i.prl; \
+	done
+endif
+
+ifneq "$($(Project)BinDistLibPrlScripts)" ""
+binary-dist::
+	@for i in $($(Project)BinDistLibPrlScripts); do \
+	     echo "Renaming $$i to $$i.prl"; \
+	    $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i.prl; \
+	done
+endif
+
+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)/$(ProjectNameShort)-$(ProjectVersion)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i.sh; \
 	done
-	@echo "Renaming hscpp to hscpp.prl"
-	@$(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/hscpp  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/hscpp.prl
+endif
 
 dist :: dist-pre
 include $(TOP)/mk/target.mk