X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=5fc80ebd9afedaabfdc885889fba806e8167f03c;hb=d1dcd244551d89d205c58fcea2a686d43079a38d;hp=413a260901a0736dd5fe80aac25dacbf7af04328;hpb=769e8c2c3359496f8e4810b8d2e1cc999429da0c;p=ghc-hetmet.git diff --git a/Makefile b/Makefile index 413a260..5fc80eb 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... +ProjectsThatExist = $(filter $(patsubst %/, %, $(wildcard */)), $(AllProjects)) + +# and filter only those that the user requested, if necessary +ifeq "$(ProjectsToBuild)" "" +SUBDIRS = $(ProjectsThatExist) +else +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)"; \ @@ -28,16 +35,6 @@ project-check : fi # ----------------------------------------------------------------------------- -# 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 # # To make a particular binary distribution: @@ -143,11 +140,19 @@ 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 ( 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. @@ -156,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; \ @@ -174,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... @@ -227,8 +234,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,10 +250,11 @@ 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 $(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 @@ -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 @@ -277,10 +288,53 @@ 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 +all :: + @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \ + 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; \ + 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), $(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; \ + fi; \ + done +NO_ALL_TARGETS=YES include $(TOP)/mk/target.mk +# ----------------------------------------------------------------------------- +