X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Ftarget.mk;h=e0ae32c007c290be5e9dfc702cfce0ff971b005c;hb=a688e396ba614be485d9cd15e19a6b6afa49ba5e;hp=31365a3cbdd6a1d392a7203a7143602c15503c96;hpb=93f4317ed0044f5b65cea869275a0479652a42f8;p=ghc-hetmet.git

diff --git a/mk/target.mk b/mk/target.mk
index 31365a3..e0ae32c 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -72,19 +72,13 @@ ifneq "$(MKDEPENDC_SRCS)" ""
 	$(MKDEPENDC) -f .depend $(MKDEPENDC_OPTS) -- $(CC_OPTS) -- $(MKDEPENDC_SRCS)
 endif
 ifneq "$(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) ; \
-	fi
+	$(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)
 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.
-#
+
+# the above patsubst is a hack to remove the '-odir $*' from HC_OPTS
+# which is present when we're splitting objects.  The $* maps to
+# nothing, since this isn't a pattern rule, so we have to get rid of
+# the -odir too to avoid problems.
 
 ##################################################################
 # 			boot
@@ -413,6 +407,16 @@ endif
 	@echo Done.
 endif
 
+# links to script programs: we sometimes install a script as
+# <name>-<version> with a link from <name> to the real script.
+
+ifneq "$(SCRIPT_LINK)" ""
+all :: $(SCRIPT_LINK)
+
+$(SCRIPT_LINK) : $(SCRIPT_PROG)
+	$(LN_S) $(SCRIPT_PROG) $(SCRIPT_LINK)
+endif
+
 
 ###########################################
 #
@@ -424,7 +428,6 @@ endif
 # get one install rule
 #
 #	INSTALL_PROGS 	  executable programs in $(bindir)
-#	INSTALL_BIN_LINKS symbolic links to 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)
@@ -468,14 +471,6 @@ install:: $(INSTALL_PROGS)
 	done
 endif
 
-ifneq "$(INSTALL_BIN_LINKS)" ""
-install:: $(INSTALL_BIN_LINKS)
-	@$(INSTALL_DIR) $(bindir)
-	for i in $(INSTALL_BIN_LINKS); do \
-		$(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i$(exeext) $(bindir); \
-	done
-endif
-
 #
 # Just like INSTALL_PROGS, but prefix with install sites bin/lib/data and
 # install without stripping.
@@ -493,7 +488,7 @@ ifneq "$(BIN_DIST)" "1"
 	   echo '$$'"libexecdir='$(libexecdir)';"                    >> $$i.tmp ; \
 	   echo '$$'"datadir='$(datadir)';"                          >> $$i.tmp ; \
 	   cat  $$i                                                >> $$i.tmp ; \
-	   echo $(INSTALL_PROGRAM) $(filter-out -s,$(INSTALL_OPTS)) $$i.tmp $(bindir)/$$i ;    \
+	   echo $(INSTALL_PROGRAM) $(filter-out -s,$(INSTALL_BIN_OPTS)) $$i.tmp $(bindir)/$$i ;    \
 	   $(INSTALL_PROGRAM) $(filter-out -s,$(INSTALL_BIN_OPTS)) $$i.tmp $(bindir)/$$i ; \
 	   $(RM) $$i.tmp; \
 	done
@@ -634,6 +629,14 @@ install-strip::
 	@$(MAKE) EXTRA_INSTALL_OPTS='-s' install                                	
 endif
 
+#
+# install links to script drivers.
+#
+ifneq "$(SCRIPT_LINK)" ""
+install ::
+	$(LN_S) $(SCRIPT_PROG) $(bindir)/$(SCRIPT_LINK)
+endif
+
 ###########################################
 #
 #	Targets: dist binary-dist
@@ -799,18 +802,18 @@ check:: $(TESTS)
 #------------------------------------------------------------
 # 			Tags
 
-.PHONY: TAGS
+.PHONY: TAGS tags
 
-TAGS:: $(SOURCES)
+tags TAGS:: $(TAGS_HS_SRCS) $(TAGS_C_SRCS)
 	@$(RM) TAGS
 	@touch TAGS
-ifneq "$(HS_SRCS)" ""
+ifneq "$(TAGS_HS_SRCS)" ""
 	$(HSTAGS) $(HSTAGS_OPTS) -- $(TAGS_HS_SRCS)
 endif
-ifneq "$(C_SRCS)" ""
+ifneq "$(TAGS_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?
+	@( DEREFFED=`ls -l Makefile | sed -e 's/.*-> \(.*\)/\1/g'` && $(RM) `dirname $$DEREFFED`/TAGS && $(CP) TAGS `dirname $$DEREFFED` ) 2>/dev/null || echo TAGS file generated, perhaps copy over to source tree?
 
 #------------------------------------------------------------
 # 			Makefile debugging
@@ -821,86 +824,50 @@ endif
 show:
 	@echo '$(VALUE)=$($(VALUE))'
 
-#------------------------------------------------------------
-# 			Documentation
-
+#--------------------------------------------------------------------------
+# SGML Documentation
+#
 .PHONY: dvi ps html info txt
 
-info:: $(DOC_INFO)
-dvi:: $(DOC_DVI)
-ps::  $(DOC_PS)
-html:: $(DOC_HTML)
-texi:: $(DOC_TEXI)
-txt:: $(DOC_TEXT)
-
-#
-# Building literate root documents requires extra treatment,
-# as the root files need to be processed different from other
-# literate files (`compile' them into .itex with the -S (standalone)
-# option) and then link together a master TeX document with
-# a -S option.
-#
-$(filter %.tex,$(patsubst %.lit,%.tex,$(DOC_SRCS))) :
-	@$(RM) $@
-	$(LIT2LATEX) -S -c $(LIT2LATEX_OPTS) -o $(patsubst %.tex,%.itex,$@) $(addsuffix .lit,$(basename $@))
-	$(LIT2LATEX) -S $(LIT2LATEX_OPTS) -o $@ $(addsuffix .itex,$(basename $@))
-	@chmod 444 $@
-#
-# Ditto for texi and html
-#
-$(filter %.texi,$(patsubst %.lit,%.texi,$(DOC_SRCS))) :
-	@$(RM) $@
-	$(LIT2TEXI) -S -c $(LIT2TEXI_OPTS) -o $(patsubst %.texi,%.itxi,$@) $(addsuffix .lit,$(basename $@))
-	$(LIT2TEXI) -S $(LIT2TEXI_OPTS) -o $@ $(addsuffix .itxi,$(basename $@))
-	@chmod 444 $@
-#
-# Rather than using lit2html, we opt for the lit-texi-html route,
-# and use texi2html as our HTML backend.
-# (Note: we need to change mkdependlit to get this really off the ground)
-#
-# If the generated html representation is split up into a myriad of files,
-# put the files in a subdirectory html/, if a monolith is created, park
-# the generated file in the same dir as the .lit file.
-#
-$(filter %.html,$(patsubst %.lit,%.html,$(DOC_SRCS))) : $(filter %.lit,$(DOC_SRCS))
-	$(RM) $@ $(patsubst %.html,%.texi,$@) $(patsubst %.html,%.itxi,$@)
-ifneq "$(filter -monolithic,$(TEXI2HTML_OPTS))" ""
-	$(LIT2TEXI) -S -c $(LIT2TEXI_OPTS) -o $(patsubst %.html,%.itxi,$@) $(addsuffix .lit,$(basename $@))
-	$(LIT2TEXI) -S $(LIT2TEXI_OPTS) -o $(patsubst %.html,%.texi,$@) $(addsuffix .itxi,$(basename $@))
-	$(TEXI2HTML) $(TEXI2HTML_OPTS) $(patsubst %.html,%.texi,$@)
-	cp $(TEXI2HTML_PREFIX)invisible.xbm .
+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
+
+VSGML_SRCS = $(wildcard *.vsgml)
+
+ifneq "$(VSGML_SRCS)" ""
+SGML_SRCS  = $(addsuffix .sgml, $(basename $(VSGML_SRCS)))
 else
-	$(RM) html/$(basename $@)*
-	$(MKDIRHIER) html
-	$(LIT2TEXI) -S -c $(LIT2TEXI_OPTS) -o $(patsubst %.html,%.itxi,$@) $(addsuffix .lit,$(basename $@))
-	$(LIT2TEXI) -S $(LIT2TEXI_OPTS) -o html/$(patsubst %.html,%.texi,$@) $(addsuffix .itxi,$(basename $@))
-	(cd html; ../$(TEXI2HTML) $(TEXI2HTML_OPTS) $(patsubst %.html,%.texi,$@); cd ..)
-	cp $(TEXI2HTML_PREFIX)invisible.xbm html/
-	@touch $@
+SGML_SRCS  = $(wildcard *.sgml)
 endif
 
-#--------------------------------------------------------------------------
-# SGML Documentation
-#
-# This will eventually replace the literate stuff for documentation
-
-SGML_SRCS = $(wildcard    *.sgml *.vsgml)
 SGML_DVI  = $(addsuffix  .dvi, $(basename $(SGML_SRCS)))
 SGML_PS   = $(addsuffix   .ps, $(basename $(SGML_SRCS)))
-SGML_TEXI = $(addsuffix .texi, $(basename $(SGML_SRCS)))
 SGML_INFO = $(addsuffix .info, $(basename $(SGML_SRCS)))
 SGML_HTML = $(addsuffix .html, $(basename $(SGML_SRCS)))
 SGML_TEXT = $(addsuffix  .txt, $(basename $(SGML_SRCS)))
 
+endif # SGML_DOC
+
 dvi  :: $(SGML_DVI)
 info :: $(SGML_INFO)
 html :: $(SGML_HTML)
 txt  :: $(SGML_TXT)
 ps   :: $(SGML_PS)
 
-CLEAN_FILES += $(SGML_TEXT) $(SGML_HTML) $(SGML_TEXI) $(SGML_PS) $(SGML_DVI)
-
-# suffix rules should handle the rest (for single-file docs at least).
+CLEAN_FILES += $(SGML_TEXT) $(SGML_HTML) $(SGML_PS) $(SGML_DVI)
 
 ###########################################
 #
@@ -1092,9 +1059,9 @@ ifneq "$(WAYS)" ""
 ifeq "$(way)" ""
 
 # NB: the targets exclude 
-#	boot info TAGS
+#	boot info TAGS runtests
 # since these are way-independent
-all docs runtests TAGS clean veryclean maintainer-clean install ::
+all docs TAGS clean veryclean maintainer-clean install ::
 	@echo "------------------------------------------------------------------------"
 	@echo "===fptools== Recursively making \`$@' for ways: $(WAYS) ..."
 	@echo "PWD = $(shell pwd)"