X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=0a8271c1820b4f1e09bef26d140acf9e25c3d03d;hb=8968073e164d4bc513e54ded0070d49c1ab1c22f;hp=40167e76645be56a4a667a7c6615f7185341612f;hpb=a0813f934bb8a3510751c9a552fdd6bb9e922b64;p=ghc-hetmet.git diff --git a/Makefile b/Makefile index 40167e7..0a8271c 100644 --- a/Makefile +++ b/Makefile @@ -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: @@ -171,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; \ @@ -189,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... @@ -261,7 +253,8 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME) 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 @@ -295,10 +288,28 @@ 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; \