[project @ 2002-11-13 12:21:08 by simonmar]

[ghc-hetmet.git] / mk / target.mk

diff --git a/mk/target.mk b/mk/target.mk
index f73420c..252d331 100644 (file)
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -44,6 +44,11 @@ PRE_SRCS := $(ALL_SRCS)
 
 include $(TOP)/mk/package.mk
 
+###################################################################
+# Suffix rules for Haskell, C and literate 
+
+include $(TOP)/mk/suffix.mk
+
 ##################################################################
 #              FPtools standard targets
 #
@@ -72,7 +77,13 @@ include $(TOP)/mk/package.mk
 # Compiler produced files that are targets of the source's imports.
 MKDEPENDHS_OBJ_SUFFICES=o
 
-depend :: $(MKDEPENDHS_SRCS) $(MKDEPENDC_SRCS)
+ifneq "$(STAMP_PKG_CONF)" ""
+PKGCONF_DEP = $(STAMP_PKG_CONF)
+else
+PKGCONF_DEP =
+endif
+
+depend :: $(MKDEPENDHS_SRCS) $(MKDEPENDC_SRCS) $(STAMP_PKG_CONF)
        @$(RM) .depend
        @touch .depend
 ifneq "$(DOC_SRCS)" ""
@@ -169,7 +180,7 @@ endif
 # `TAGS'
 #      Update a tags table for this program.
 # 
-# `dvi' `ps' `pdf' `html' `pdf'
+# `dvi' `ps' `pdf' `html' `rtf' 
 #      Generate DVI/PS/PDF files for LaTeX/DocBook docs. Not everything is
 #      supported everywhere, but the intention is to standardise on DocBook
 #      producing all formats.
@@ -296,9 +307,8 @@ SRC_HC_OPTS += -split-objs
 ifeq "$(ArSupportsInput)" ""
 define BUILD_LIB
 $(RM) $@ $@.tmp
-(echo $(STUBOBJS) $(EXTRA_OBJS); $(FIND) $(patsubst %.$(way_)o,%_split,$(HS_OBJS)) -name '*.$(way_)o') | xargs ar q $@.tmp
-$(RANLIB) $@.tmp
-$(MV) $@.tmp $@
+(echo $(STUBOBJS) $(EXTRA_OBJS); $(FIND) $(patsubst %.$(way_)o,%_split,$(HS_OBJS)) -name '*.$(way_)o') | xargs ar q $@
+$(RANLIB) $@
 endef
 else
 define BUILD_LIB
@@ -306,10 +316,9 @@ $(RM) $@ $@.tmp
 echo $(STUBOBJS)    > $@.list
 echo $(EXTRA_OBJS) >> $@.list
 $(FIND) $(patsubst %.$(way_)o,%_split,$(HS_OBJS)) -name '*.$(way_)o' >> $@.list
-$(AR) $(AR_OPTS) $@.tmp $(ArSupportsInput) $@.list
+$(AR) $(AR_OPTS) $@ $(ArSupportsInput) $@.list
 $(RM) $@.list
-$(RANLIB) $@.tmp
-$(MV) $@.tmp $@
+$(RANLIB) $@
 endef
 endif
 
@@ -801,10 +810,13 @@ ifneq "$(INSTALL_SGML_DOC)" ""
 ifneq "$(SGMLDocWays)" ""
 install-docs:: $(foreach i,$(SGMLDocWays),$(INSTALL_SGML_DOC).$i)
        @$(INSTALL_DIR) $(datadir)      
-       for i in $(SGMLDocWays); do \
+       @for i in $(SGMLDocWays); do \
                if [ $$i = "html" ]; then \
-                       $(CP) -r $(INSTALL_SGML_DOC) $(datadir); \
+                       $(INSTALL_DIR) $(datadir)/html; \
+                       echo $(CP) -r $(INSTALL_SGML_DOC) $(datadir)/html; \
+                       $(CP) -r $(INSTALL_SGML_DOC) $(datadir)/html; \
                else \
+                       echo $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_SGML_DOC).$$i $(datadir); \
                        $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_SGML_DOC).$$i $(datadir); \
                fi \
        done