X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Ftarget.mk;h=39452e120827a452ad9ae4d80f8e8a60d2ace593;hb=e8275a4f4706e544df8624c2b6b469afaf05a8a5;hp=e4ad31a25a0ae82262b555ee0eeb0d2992e93581;hpb=8e2852818cda11e8e6421d28d64a2275f2fd9c93;p=ghc-hetmet.git diff --git a/mk/target.mk b/mk/target.mk index e4ad31a..39452e1 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -59,6 +59,9 @@ # .PHONY: depend +# Compiler produced files that are targets of the source's imports. +MKDEPENDHS_OBJ_SUFFICES=o + depend :: $(MKDEPENDHS_SRCS) $(MKDEPENDC_SRCS) @$(RM) .depend @touch .depend @@ -69,17 +72,19 @@ ifneq "$(MKDEPENDC_SRCS)" "" $(MKDEPENDC) -f .depend $(MKDEPENDC_OPTS) -- $(CC_OPTS) -- $(MKDEPENDC_SRCS) endif ifneq "$(MKDEPENDHS_SRCS)" "" -ifeq ($(notdir $(MKDEPENDHS)),ghc) -# New way of doing dependencies: the ghc driver knows how to invoke script - $(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(MKDEPENDHS_OPTS) $(HC_OPTS) $(MKDEPENDHS_SRCS) -else -# Old way: call mkdependHS-1.2 - $(MKDEPENDHS) -f .depend $(MKDEPENDHS_OPTS) \ - $(foreach way,$(WAYS),-s $(way)) \ - -- $(HC_OPTS) -- $(MKDEPENDHS_SRCS) -endif + @if ( echo $(notdir $(MKDEPENDHS)) | grep ghc >/dev/null 2>&1 ); then \ + echo $(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-optdep-o -optdep$(obj)) $(MKDEPENDHS_OPTS) $(HC_OPTS) $(MKDEPENDHS_SRCS) ; \ + $(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-optdep-o -optdep$(obj)) $(MKDEPENDHS_OPTS) $(HC_OPTS) $(MKDEPENDHS_SRCS) ; \ + else \ + echo $(MKDEPENDHS) -f .depend $(MKDEPENDHS_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(HC_OPTS) -- $(MKDEPENDHS_SRCS) ; \ + $(MKDEPENDHS) -f .depend $(MKDEPENDHS_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(HC_OPTS) -- $(MKDEPENDHS_SRCS) ; \ + fi endif - +# +# The above decides whether to invoke the computation of dependencies +# the ghc-0.xx or the ghc-2.x way by looking for "ghc" in the name of +# of the `make depend' script. Not bulletproof this. +# ################################################################## # boot @@ -369,17 +374,26 @@ ifneq "$(SCRIPT_PROG)" "" # # ToDo: make this work for shell scripts (drop the initial $). # +ifeq "$(INTERP)" "$(SHELL)" +SCRIPT_SUBST=$(foreach val,$(SCRIPT_SUBST_VARS),"echo \"$(val)=\\\"$($(val))\\\";\" >> $@;") +else SCRIPT_SUBST=$(foreach val,$(SCRIPT_SUBST_VARS),"echo \"$$\"\"$(val)=\\\"$($(val))\\\";\" >> $@;") +endif all :: $(SCRIPT_PROG) +# +# #! support under cygwin32 is not quite there yet, +# so we rely on the eval `trick' instead. On all other +# platforms, we prepend #!$(INTERP) -- SOF 6/97 +# + $(SCRIPT_PROG) :: $(SCRIPT_OBJS) $(RM) $@ @echo Creating $@... ifeq "$(INTERP)" "perl" ifneq "$(BIN_DIST)" "1" - @echo "eval 'exec perl -S $$$""0 $$""{1+\"$$$""@\"}'" > $@ - @echo " if $$""running_under_some_shell;" >> $@ + echo "#! "$(PERL) > $@ else @touch $@ endif @@ -409,11 +423,11 @@ endif # For each of these variables that is defined, you # get one install rule # -# INSTALL_PROGS install these executable programs in $(bindir) -# INSTALL_SCRIPTS install these executable scripts in $(bindir) -# INSTALL_LIBS install these platform-dependent libraries in $(libdir) -# INSTALL_LIBEXECS install these platform-dependent execs in $(libdir) -# INSTALL_DATAS install these platform-independent files in $(datadir) +# INSTALL_PROGS executable programs in $(bindir) +# INSTALL_SCRIPTS executable scripts in $(bindir) +# INSTALL_LIBS platform-dependent libraries in $(libdir) (ranlib'ed) +# INSTALL_LIBEXECS platform-dependent execs in $(libdir) +# INSTALL_DATAS platform-independent files in $(datadir) # # If the installation directory variable is undefined, the install rule simply # emits a suitable error message. @@ -422,25 +436,34 @@ endif # friends can be overridden from their original settings in mk/config.mk.in # || mk/build.mk # -.PHONY: install installdirs install-strip install-dirs uninstall install-docs +.PHONY: install installdirs install-strip install-dirs uninstall install-docs show-install + +show-install : + @echo "bindir = $(bindir)" + @echo "libdir = $(libdir)" + @echo "libexecdir = $(libexecdir) # by default, same as libdir" + @echo "datadir = $(datadir) # unused for ghc project" # # Sometimes useful to separate out the creation of install directories # from the installation itself. # -installdirs :: +install-dirs :: @$(INSTALL_DIR) $(bindir) @$(INSTALL_DIR) $(libdir) @$(INSTALL_DIR) $(libexecdir) @$(INSTALL_DIR) $(datadir) # Better do this first... -install:: installdirs +# but we won't for the moment, do it on-demand from +# within the various install targets instead. +#install:: install-dirs ifneq "$(INSTALL_PROGS)" "" install:: $(INSTALL_PROGS) + @$(INSTALL_DIR) $(bindir) for i in $(INSTALL_PROGS); do \ - $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(bindir); \ + $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i$(exeext) $(bindir); \ done endif @@ -450,18 +473,19 @@ endif # ifneq "$(INSTALL_SCRIPTS)" "" install:: $(INSTALL_SCRIPTS) + @$(INSTALL_DIR) $(bindir) ifeq "$(INTERP)" "perl" ifneq "$(BIN_DIST)" "1" @for i in $(INSTALL_SCRIPTS); do \ $(RM) $$i.tmp; \ - echo "eval 'exec $(PERL) -S $$$""0 $$""{1+\"$$$""@\"}'" > $$i.tmp ; \ - echo " if $$""running_under_some_shell;" >> $$i.tmp ; \ + echo "#! $(PERL)" > $$i.tmp ; \ echo $$"bindir='$(bindir)';" >> $$i.tmp ; \ - echo $$"libdir='$(real_libdir)';" >> $$i.tmp ; \ - echo $$"datadir='$(real_datadir)';" >> $$i.tmp ; \ + echo $$"libdir='$(libdir)';" >> $$i.tmp ; \ + echo $$"libexecdir='$(libexecdir)';" >> $$i.tmp ; \ + echo $$"datadir='$(datadir)';" >> $$i.tmp ; \ cat $$i >> $$i.tmp ; \ - echo $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(bindir) ; \ - $(INSTALL_PROGRAM) $(filter-out -s,,$(INSTALL_BIN_OPTS)) $$i.tmp $(bindir)/$$i ; \ + echo $(INSTALL_PROGRAM) $(filter-out -s,$(INSTALL_OPTS)) $$i.tmp $(bindir)/$$i ; \ + $(INSTALL_PROGRAM) $(filter-out -s,$(INSTALL_BIN_OPTS)) $$i.tmp $(bindir)/$$i ; \ $(RM) $$i.tmp; \ done else @@ -478,15 +502,16 @@ endif ifneq "$(INSTALL_LIB_SCRIPTS)" "" install:: $(INSTALL_LIB_SCRIPTS) + @$(INSTALL_DIR) $(libdir) ifeq "$(INTERP)" "perl" ifneq "$(BIN_DIST)" "1" @for i in $(INSTALL_LIB_SCRIPTS); do \ $(RM) $$i.tmp; \ - echo "eval 'exec $(PERL) -S $$$""0 $$""{1+\"$$$""@\"}'" > $$i.tmp ; \ - echo " if $$""running_under_some_shell;" >> $$i.tmp ; \ + echo "#! $(PERL)" > $$i.tmp ; \ echo $$"bindir='$(bindir)';" >> $$i.tmp ; \ - echo $$"libdir='$(real_libdir)';" >> $$i.tmp ; \ - echo $$"datadir='$(real_datadir)';" >> $$i.tmp ; \ + echo $$"libdir='$(libdir)';" >> $$i.tmp ; \ + echo $$"libexecdir='$(libexecdir)';" >> $$i.tmp ; \ + echo $$"datadir='$(datadir)';" >> $$i.tmp ; \ cat $$i >> $$i.tmp ; \ echo $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(libdir) ; \ $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i.tmp $(libdir)/$$i ; \ @@ -506,15 +531,16 @@ endif ifneq "$(INSTALL_LIBEXEC_SCRIPTS)" "" install:: $(INSTALL_LIBEXEC_SCRIPTS) + @$(INSTALL_DIR) $(libexecdir) ifeq "$(INTERP)" "perl" ifneq "$(BIN_DIST)" "1" @for i in $(INSTALL_LIBEXEC_SCRIPTS); do \ $(RM) $$i.tmp; \ - echo "eval 'exec $(PERL) -S $$$""0 $$""{1+\"$$$""@\"}'" > $$i.tmp ; \ - echo " if $$""running_under_some_shell;" >> $$i.tmp ; \ + echo "#! $(PERL)" > $$i.tmp ; \ echo $$"bindir='$(bindir)';" >> $$i.tmp ; \ - echo $$"libdir='$(real_libdir)';" >> $$i.tmp ; \ - echo $$"datadir='$(real_datadir)';" >> $$i.tmp ; \ + echo $$"libdir='$(libdir)';" >> $$i.tmp ; \ + echo $$"libexecdir='$(libexecdir)';" >> $$i.tmp ; \ + echo $$"datadir='$(datadir)';" >> $$i.tmp ; \ cat $$i >> $$i.tmp ; \ echo $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(libexecdir) ; \ $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i.tmp $(libexecdir)/$$i ; \ @@ -534,20 +560,29 @@ endif ifneq "$(INSTALL_LIBS)" "" install:: $(INSTALL_LIBS) + @$(INSTALL_DIR) $(libdir) for i in $(INSTALL_LIBS); do \ - $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(libdir); \ + case $$i in \ + *.a) \ + $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(libdir); \ + $(RANLIB) $(libdir)/`basename $$i` ;; \ + *) \ + $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(libdir); \ + esac; \ done endif ifneq "$(INSTALL_LIBEXECS)" "" install:: $(INSTALL_LIBEXECS) + @$(INSTALL_DIR) $(libexecdir) -for i in $(INSTALL_LIBEXECS); do \ - $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(libexecdir); \ + $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i$(exeext) $(libexecdir); \ done endif ifneq "$(INSTALL_DATAS)" "" install:: $(INSTALL_DATAS) + @$(INSTALL_DIR) $(datadir) for i in $(INSTALL_DATAS); do \ $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir); \ done @@ -761,11 +796,12 @@ TAGS:: $(SOURCES) @$(RM) TAGS @touch TAGS ifneq "$(HS_SRCS)" "" - $(HSTAGS) $(HSTAGS_OPTS) -- $(HS_SRCS) + $(HSTAGS) $(HSTAGS_OPTS) -- $(TAGS_HS_SRCS) endif ifneq "$(C_SRCS)" "" - etags -a $(C_SRCS) + etags -a $(TAGS_C_SRCS) endif + @( DEREFFED=`ls -l Makefile | sed -e 's/.*-> \(.*\)/\1/g'` && $(RM) `dirname $$DEREFFED`/TAGS && $(CP) TAGS `dirname $$DEREFFED` ) || echo TAGS file generated, perhaps copy over to source tree? #------------------------------------------------------------ # Makefile debugging @@ -878,7 +914,8 @@ endif ifneq "$(HS_OBJS)" "" ifneq "$(filter -split-objs,$(HC_OPTS))" "" clean :: - find $(patsubst %.$(way_)o,%,$(HS_OBJS)) -name '*.$(way_)o' -print | xargs $(RM) __rm_food; + find $(patsubst %.$(way_)o,%,$(HS_OBJS)) -name '*.$(way_)o' -print | xargs $(RM) __rm_food + -rmdir $(patsubst %.$(way_)o,%,$(HS_OBJS)) endif endif @@ -971,12 +1008,12 @@ ifeq "$(way)" "" ifneq "$(SUBDIRS)" "" all docs runtests boot TAGS clean veryclean maintainer-clean install info :: - @case '${MFLAGS}' in *[ik]*) set +e;; esac; @echo "------------------------------------------------------------------------" @echo "===fptools== Recursively making \`$@' in $(SUBDIRS) ..." @echo "PWD = $(shell pwd)" @echo "------------------------------------------------------------------------" - @for i in $(SUBDIRS) ; do \ + @case '${MFLAGS}' in -*[ik]*) set +e;; *) set -e;; esac; \ + for i in $(SUBDIRS) ; do \ echo "------------------------------------------------------------------------"; \ echo "==fptools== $(MAKE) $@;"; \ echo " in $(shell pwd)/$$i"; \ @@ -989,7 +1026,7 @@ all docs runtests boot TAGS clean veryclean maintainer-clean install info :: @echo "------------------------------------------------------------------------" dist :: - @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ + @case '${MFLAGS}' in -*[ik]*) set +e;; *) set -e;; esac; \ for i in $(SUBDIRS) ; do \ $(MKDIRHIER_PREFIX)mkdirhier $(SRC_DIST_DIR)/$$i; \ $(MAKE) -C $$i $(MFLAGS) $@ SRC_DIST_DIR=$(SRC_DIST_DIR)/$$i; \ @@ -1017,7 +1054,8 @@ all docs runtests TAGS clean veryclean maintainer-clean install :: @echo "===fptools== Recursively making \`$@' for ways: $(WAYS) ..." @echo "PWD = $(shell pwd)" @echo "------------------------------------------------------------------------" - @for i in $(WAYS) ; do \ + @case '${MFLAGS}' in -*[ik]*) set +e;; *) set -e;; esac; \ + for i in $(WAYS) ; do \ echo "------------------------------------------------------------------------"; \ echo "==fptools== $(MAKE) way=$$i $@;"; \ echo "PWD = $(shell pwd)"; \