X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Ftarget.mk;h=7743c421b0d8e190827a3c60af95948a1a98953b;hb=65d0aa7f89fb1aab35e3aa4980a249d9e60c1087;hp=463e0bc2e6adc1c7dfe5d74ab81bd2e9ca767be8;hpb=c6bed6debe26cc4225ac0db0ff625dd55bc9f9e1;p=ghc-hetmet.git

diff --git a/mk/target.mk b/mk/target.mk
index 463e0bc..7743c42 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -69,7 +69,7 @@ ifneq "$(DOC_SRCS)" ""
 	$(MKDEPENDLIT) -o .depend $(MKDEPENDLIT_OPTS) $(filter %.lit,$(DOC_SRCS))
 endif
 ifneq "$(MKDEPENDC_SRCS)" ""
-	$(MKDEPENDC) -f .depend $(MKDEPENDC_OPTS) -- $(CC_OPTS) -- $(MKDEPENDC_SRCS)
+	$(MKDEPENDC) -f .depend $(MKDEPENDC_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(CC_OPTS) -- $(MKDEPENDC_SRCS) 
 endif
 ifneq "$(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) $(patsubst -odir,,$(HC_OPTS)) $(MKDEPENDHS_SRCS)
@@ -328,7 +328,7 @@ endif
 # Remove local symbols from library objects if requested.
 #
 
-ifneq "$(StripLibraries)" ""
+ifeq "$(StripLibraries)" "YES"
 ifneq "$(filter -split-objs,$(HC_OPTS))" ""
 SRC_HC_POST_OPTS += \
   for i in $(basename $@)/*; do \
@@ -337,7 +337,7 @@ SRC_HC_POST_OPTS += \
   done
 else
 SRC_HC_POST_OPTS += \
-  ld -r -x -o $@.tmp; $(MV) $@.tmp $@
+  ld -r -x -o $@.tmp $@; $(MV) $@.tmp $@
 endif
 endif
 
@@ -437,7 +437,7 @@ all :: $(SCRIPT_LINK)
 # on perl.
 #
 $(SCRIPT_LINK) : $(SCRIPT_PROG)
-	@if ( perl -e '$$fn="$(SCRIPT_LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
+	@if ( $(PERL) -e '$$fn="$(SCRIPT_LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
 	   echo "Creating a symbol link from $(SCRIPT_PROG) to $(SCRIPT_LINK)"; \
 	   $(RM) $(SCRIPT_LINK); \
 	   $(LN_S) $(SCRIPT_PROG) $(SCRIPT_LINK); \
@@ -459,11 +459,12 @@ endif
 # For each of these variables that is defined, you
 # get one install rule
 #
-#	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)
+#	INSTALL_PROGS 	     executable programs in $(bindir)
+#	INSTALL_SCRIPTS	     executable scripts in $(bindir)
+#	INSTALL_LIBS	     platform-dependent libraries in $(libdir) (ranlib'ed)
+#	INSTALL_LIB_SCRIPTS  platform-dependent scripts   in $(libdir)
+#	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.
@@ -667,7 +668,16 @@ endif
 #
 ifneq "$(SCRIPT_LINK)" ""
 install ::
-	$(LN_S) $(SCRIPT_PROG) $(bindir)/$(SCRIPT_LINK)
+	@if ( $(PERL) -e '$$fn="$(bindir)/$(SCRIPT_LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
+	   echo "Creating a symbol link from $(SCRIPT_PROG) to $(SCRIPT_LINK) in $(bindir)"; \
+	   $(RM) $(bindir)/$(SCRIPT_LINK); \
+	   $(LN_S) $(SCRIPT_PROG) $(bindir)/$(SCRIPT_LINK); \
+	 else \
+	   echo "Creating a symbol link from $(SCRIPT_PROG) to $(SCRIPT_LINK) in $(bindir) failed: \`$(bindir)/$(SCRIPT_LINK)' already exists"; \
+	   echo "Perhaps remove \`$(bindir)/$(SCRIPT_LINK)' manually?"; \
+	   exit 1; \
+	 fi;
+
 endif
 
 ###########################################
@@ -741,9 +751,14 @@ dist-post::
 dist-manifest ::
 	cd $(SRC_DIST_DIR); find . \( -type l -o -type f \) -exec ls -lLG {} \; | sed -e 's/\.\///' > /tmp/MANIFEST ; mv /tmp/MANIFEST MANIFEST
 
-dist-package::
+dist-package:: dist-package-tar-gz
+
+dist-package-tar-gz ::
 	cd $(SRC_DIST_DIR); cd ..; $(TAR) chzf $(SRC_DIST_NAME).tar.gz $(SRC_DIST_NAME)
 
+dist-package-zip ::
+	cd $(SRC_DIST_DIR); cd ..; $(ZIP) $(ZIP_OPTS) -r $(SRC_DIST_NAME).zip $(SRC_DIST_NAME)
+
 #
 # binary-dist creates a binary bundle, set BIN_DIST_NAME
 # to package name and do `make binary-dist' (normally this
@@ -851,32 +866,25 @@ ifneq "$(SGML_DOC)" ""
 # multi-file SGML document: main document name is specified in $(SGML_DOC),
 # sub-documents (.sgml files) listed in $(SGML_SRCS).
 
-$(SGML_DOC).sgml : $(SGML_SRCS)
-	cat $(SGML_SRCS) > $(SGML_DOC).sgml
-
-SGML_DVI  = $(SGML_DOC).dvi
-SGML_PS   = $(SGML_DOC).ps
-SGML_INFO = $(SGML_DOC).info
-SGML_HTML = $(SGML_DOC).html
-SGML_TEXT = $(SGML_DOC).txt
-
-else # no SGML_DOC
-
+ifeq "$(VSGML_SRCS)" ""
 VSGML_SRCS = $(wildcard *.vsgml)
+endif
 
+ifeq "$(SGML_SRCS)" ""
 ifneq "$(VSGML_SRCS)" ""
-SGML_SRCS  = $(addsuffix .sgml, $(basename $(VSGML_SRCS)))
+SGML_SRCS = $(patsubst %.vsgml, %.sgml, $(VSGML_SRCS))
 else
-SGML_SRCS  = $(wildcard *.sgml)
+SGML_SRCS = $(wildcard *.sgml)
+endif
 endif
 
-SGML_DVI  = $(addsuffix  .dvi, $(basename $(SGML_SRCS)))
-SGML_PS   = $(addsuffix   .ps, $(basename $(SGML_SRCS)))
-SGML_INFO = $(addsuffix .info, $(basename $(SGML_SRCS)))
-SGML_HTML = $(addsuffix .html, $(basename $(SGML_SRCS)))
-SGML_TEXT = $(addsuffix  .txt, $(basename $(SGML_SRCS)))
+SGML_DVI  = $(SGML_DOC).dvi
+SGML_PS   = $(SGML_DOC).ps
+SGML_INFO = $(SGML_DOC).info
+SGML_HTML = $(SGML_DOC).html
+SGML_TEXT = $(SGML_DOC).txt
 
-endif # SGML_DOC
+$(SGML_DVI) $(SGML_PS) $(SGML_INFO) $(SGML_HTML) $(SGML_TEXT) :: $(SGML_SRCS)
 
 dvi  :: $(SGML_DVI)
 info :: $(SGML_INFO)
@@ -884,7 +892,9 @@ html :: $(SGML_HTML)
 txt  :: $(SGML_TXT)
 ps   :: $(SGML_PS)
 
-CLEAN_FILES += $(SGML_TEXT) $(SGML_HTML) $(SGML_PS) $(SGML_DVI)
+CLEAN_FILES += $(SGML_TEXT) $(SGML_DOC)*.html $(SGML_PS) $(SGML_DVI)
+
+endif
 
 ###########################################
 #
@@ -932,7 +942,7 @@ ifneq "$(HS_OBJS)" ""
 ifneq "$(filter -split-objs,$(HC_OPTS))" ""
 clean ::
 	find $(patsubst %.$(way_)o,%,$(HS_OBJS)) -name '*.$(way_)o' -print | xargs $(RM) __rm_food
-	-rmdir $(patsubst %.$(way_)o,%,$(HS_OBJS))
+	-rmdir $(patsubst %.$(way_)o,%,$(HS_OBJS)) > /dev/null 2>&1
 endif
 endif