X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Ftarget.mk;h=39452e120827a452ad9ae4d80f8e8a60d2ace593;hb=e0af91a3dd6abafa313bf7eacf68e1179f41e136;hp=4da238e8fc6e0130eba6341179cfc01e769b2f48;hpb=b965a36a1cd1732eaa7fa4cea4bc0c86132d04fe;p=ghc-hetmet.git diff --git a/mk/target.mk b/mk/target.mk index 4da238e..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,9 +72,9 @@ ifneq "$(MKDEPENDC_SRCS)" "" $(MKDEPENDC) -f .depend $(MKDEPENDC_OPTS) -- $(CC_OPTS) -- $(MKDEPENDC_SRCS) endif ifneq "$(MKDEPENDHS_SRCS)" "" - @if echo $(notdir $(MKDEPENDHS)) | grep -s ghc ; then \ - echo $(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(MKDEPENDHS_OPTS) $(HC_OPTS) $(MKDEPENDHS_SRCS) ; \ - $(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(MKDEPENDHS_OPTS) $(HC_OPTS) $(MKDEPENDHS_SRCS) ; \ + @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) ; \ @@ -371,18 +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 "#!/bin/sh -- # to stop perl from looping " > $@ - @echo "eval 'exec perl -S $$$""0 $$""{1+\"$$$""@\"}'" >> $@ - @echo " if $$""running_under_some_shell;" >> $@ + echo "#! "$(PERL) > $@ else @touch $@ endif @@ -412,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. @@ -452,7 +463,7 @@ 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 @@ -467,9 +478,7 @@ ifeq "$(INTERP)" "perl" ifneq "$(BIN_DIST)" "1" @for i in $(INSTALL_SCRIPTS); do \ $(RM) $$i.tmp; \ - @echo "#!/bin/sh -- # to stop perl from looping " > $$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='$(libdir)';" >> $$i.tmp ; \ echo $$"libexecdir='$(libexecdir)';" >> $$i.tmp ; \ @@ -498,9 +507,7 @@ ifeq "$(INTERP)" "perl" ifneq "$(BIN_DIST)" "1" @for i in $(INSTALL_LIB_SCRIPTS); do \ $(RM) $$i.tmp; \ - @echo "#!/bin/sh -- # to stop perl from looping " > $$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='$(libdir)';" >> $$i.tmp ; \ echo $$"libexecdir='$(libexecdir)';" >> $$i.tmp ; \ @@ -529,9 +536,7 @@ ifeq "$(INTERP)" "perl" ifneq "$(BIN_DIST)" "1" @for i in $(INSTALL_LIBEXEC_SCRIPTS); do \ $(RM) $$i.tmp; \ - @echo "#!/bin/sh -- # to stop perl from looping " > $$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='$(libdir)';" >> $$i.tmp ; \ echo $$"libexecdir='$(libexecdir)';" >> $$i.tmp ; \ @@ -557,7 +562,13 @@ 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 @@ -565,7 +576,7 @@ 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 @@ -785,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 @@ -902,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 @@ -995,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"; \ @@ -1013,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; \ @@ -1041,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)"; \