X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=7f680ee219e5899b93c16c20738c1add443e7382;hb=bf0256fa2f80b8f84acc40c1c8841da008a3c353;hp=7036d7c0f871c9278b07b58182e3252a3fc9a701;hpb=0147f8cce1d6c972de066df2da627206bb8b2e8d;p=ghc-hetmet.git diff --git a/Makefile b/Makefile index 7036d7c..7f680ee 100644 --- a/Makefile +++ b/Makefile @@ -10,13 +10,13 @@ TOP=. include $(TOP)/mk/boilerplate.mk # 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)" "" @@ -35,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: @@ -88,7 +78,6 @@ BIN_DIST_TOP= distrib/Makefile-bin.in \ distrib/INSTALL \ $(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 \ @@ -171,6 +160,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; \ @@ -189,6 +179,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... @@ -258,10 +249,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 @@ -275,8 +267,8 @@ dist :: -rm -f $(SRC_DIST_NAME).tar.gz mkdir $(SRC_DIST_DIR) mkdir $(SRC_DIST_DIR)/mk - ( cd $(FPTOOLS_TOP_ABS); $(FIND) $(SRC_DIST_DIRS) -type d \( -name CVS -prune -o -name SRC -prune -o -name tests -prune -o -exec mkdir $(SRC_DIST_DIR)/{} \; \) ; ) - ( cd $(FPTOOLS_TOP_ABS); $(FIND) $(SRC_DIST_DIRS) $(SRC_DIST_FILES) -name CVS -prune -o -name SRC -prune -o -name tests -prune -o -name "*~" -prune -o -name ".cvsignore" -prune -o -name "\#*" -prune -o -name ".\#*" -prune -o -name "log" -prune -o -name "*-SAVE" -prune -o -name "*.orig" -prune -o -name "*.rej" -prune -o ! -type d -exec $(LN_S) $(FPTOOLS_TOP_ABS)/{} $(SRC_DIST_DIR)/{} \; ) + ( cd $(FPTOOLS_TOP_ABS); $(FIND) $(SRC_DIST_DIRS) -type d \( -name CVS -prune -o -name SRC -prune -o -print \) | sed -e 's!.*!mkdir "$(SRC_DIST_DIR)/&"!' | sh ) + ( cd $(FPTOOLS_TOP_ABS); $(FIND) $(SRC_DIST_DIRS) $(SRC_DIST_FILES) -name CVS -prune -o -name SRC -prune -o -name tests -prune -o -name "*~" -prune -o -name ".cvsignore" -prune -o -name "\#*" -prune -o -name ".\#*" -prune -o -name "log" -prune -o -name "*-SAVE" -prune -o -name "*.orig" -prune -o -name "*.rej" -prune -o ! -type d -print | sed -e 's!.*!$(LN_S) "$(FPTOOLS_TOP_ABS)/&" "$(SRC_DIST_DIR)/&"!' | sh ) # Automatic generation of a MANIFEST file for a source distribution # tree that is ready to go. @@ -295,14 +287,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) -r $(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; \ @@ -315,14 +325,18 @@ 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; \ fi; \ done -NO_ALL_TARGETS=YES +# Turn off target.mk's rules for 'all', 'boot' and 'install'. +NO_BOOT_TARGET=YES +NO_ALL_TARGET=YES +NO_INSTALL_TARGET=YES + include $(TOP)/mk/target.mk # -----------------------------------------------------------------------------