[project @ 2001-11-13 03:28:03 by chak]

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

diff --git a/mk/target.mk b/mk/target.mk
index f48ebbd..dc6add1 100644 (file)
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -388,7 +388,6 @@ endif
 
 ifeq "$(IS_CBITS_LIB)" "YES"
 override datadir:=$(libdir)/include
-INSTALL_DATAS += Hs$(shell perl -e 'print ucfirst "$(PACKAGE)"').h
 else
 SRC_CC_OPTS += -Icbits
 endif
@@ -438,20 +437,25 @@ ifneq "$(way)" "u"
 
 SRC_HC_OPTS += -split-objs
 
+# We generate the archive into a temporary file libfoo.a.tmp, then
+# rename it at the end.  This avoids the problem that ar may sometimes
+# fail, leaving a partially built archive behind.
 ifeq "$(ArSupportsInput)" ""
 define BUILD_LIB
-$(RM) $@
-(echo $(STUBOBJS); $(FIND) $(patsubst %.$(way_)o,%,$(LIBOBJS)) -name '*.$(way_)o') | xargs ar q $@
-$(RANLIB) $@
+$(RM) $@ $@.tmp
+(echo $(STUBOBJS); $(FIND) $(patsubst %.$(way_)o,%,$(LIBOBJS)) -name '*.$(way_)o') | xargs ar q $@.tmp
+$(RANLIB) $@.tmp
+$(MV) $@.tmp $@
 endef
 else
 define BUILD_LIB
-$(RM) $@
+$(RM) $@ $@.tmp
 echo $(STUBOBJS) > $@.list
 $(FIND) $(patsubst %.$(way_)o,%,$(LIBOBJS)) -name '*.$(way_)o' >> $@.list
-$(AR) $(AR_OPTS) $@ $(ArSupportsInput) $@.list
+$(AR) $(AR_OPTS) $@.tmp $(ArSupportsInput) $@.list
 $(RM) $@.list
-$(RANLIB) $@
+$(RANLIB) $@.tmp
+$(MV) $@.tmp $@
 endef
 endif
 
@@ -461,7 +465,7 @@ HC_SPLIT_PRE = \
     $(RM) $@; if [ ! -d $(basename $@) ]; then mkdir $(basename $@); else \
     $(FIND) $(basename $@) -name '*.$(way_)o' | xargs $(RM) __rm_food; fi
 ifeq "$(GhcWithInterpreter)" "YES"
-HC_SPLIT_POST = $(LD) -r -x -o $@ $(basename $@)/*.$(way_)o
+HC_SPLIT_POST = $(LD) -r $(LD_X) -o $@ $(basename $@)/*.$(way_)o
 else
 HC_SPLIT_POST = touch $@
 endif # GhcWithInterpreter == YES
@@ -491,12 +495,12 @@ ifeq "$(StripLibraries)" "YES"
 ifeq "$(SplitObjs)" "YES"
 SRC_HC_POST_OPTS += \
   for i in $(basename $@)/*; do \
-       $(LD) -r -x -o $$i.tmp $$i; \
+       $(LD) -r $(LD_X) -o $$i.tmp $$i; \
        $(MV) $$i.tmp $$i; \
   done
 else
 SRC_HC_POST_OPTS += \
-  $(LD) -r -x -o $@.tmp $@; $(MV) $@.tmp $@
+  $(LD) -r $(LD_X) -o $@.tmp $@; $(MV) $@.tmp $@
 endif # SplitObjs
 endif # StripLibraries
 
@@ -538,7 +542,7 @@ ifneq "$(DONT_WANT_STD_GHCI_LIB_RULE)" "YES"
 # hslibs/Win32 uses this 'feature'.
 #
 $(GHCI_LIBRARY) :: $(LIBOBJS)
-       $(LD) -r -x -o $@ $(LIBOBJS) $(STUBOBJS)
+       $(LD) -r $(LD_X) -o $@ $(LIBOBJS) $(STUBOBJS)
 
 endif # DONT_WANT_STD_GHCI_LIB_RULE
 endif # GhcWithInterpreter
@@ -961,22 +965,27 @@ install:: $(INSTALL_INCLUDES)
        done
 endif
 
-ifneq "$(INSTALL_DOCS) $(INSTALL_SGML_DOCS)" ""
-install-docs:: $(INSTALL_DOCS) $(foreach i,$(INSTALL_SGML_DOCS),$(foreach j,$(SGMLDocWays),$i.$j))
-       @$(INSTALL_DIR) $(datadir)
+ifneq "$(INSTALL_DOCS)" ""
+install-docs:: $(INSTALL_DOCS)
+       @$(INSTALL_DIR) $(datadir)      
        for i in $(INSTALL_DOCS); do \
                $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir); \
        done
-       for i in $(INSTALL_SGML_DOCS); do \
-               for j in $(SGMLDocWays); do \
-                       if [ $$j = "html" ]; then \
-                               $(CP) -r $$i $(datadir); \
-                       else \
-                               $(INSTALL_DATA) $(INSTALL_OPTS) $$i.$$j $(datadir); \
-                       fi \
-               done \
+endif
+
+ifneq "$(INSTALL_SGML_DOC)" ""
+ifneq "$(SGMLDocWays)" ""
+install-docs:: $(foreach i,$(SGMLDocWays),$(INSTALL_SGML_DOC).$i)
+       @$(INSTALL_DIR) $(datadir)      
+       for i in $(SGMLDocWays); do \
+               if [ $$i = "html" ]; then \
+                       $(CP) -r $(INSTALL_SGML_DOC) $(datadir); \
+               else \
+                       $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_SGML_DOC).$$i $(datadir); \
+               fi \
        done
 endif
+endif
 
 #
 # Use with care..