[project @ 2001-01-15 17:05:46 by sewardj]

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

diff --git a/mk/target.mk b/mk/target.mk
index 667cdc8..287fa40 100644 (file)
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -414,10 +414,15 @@ ifeq "$(GHCI_LIBOBJS)" ""
 GHCI_LIBOBJS = $(LIBOBJS)
 endif
 
+ifneq "$(HS_SRCS)" ""
 ifeq "$(SplitObjs)" "YES"
 $(GHCI_LIBRARY) :: $(GHCI_LIBOBJS)
-       ( echo $(STUBOBJS) ; $(FIND) $(patsubst %.$(way_)o,%,$(LIBOBJS)) -name '*.$(way_)o' -print ) | xargs ld -r -x -o $@
-else
+       ( echo $(STUBOBJS) ; $(FIND) $(patsubst %.$(way_)o,%,$(GHCI_LIBOBJS)) -name '*.$(way_)o' -print ) | xargs ld -r -x -o $@
+else # not SplitObjs
+$(GHCI_LIBRARY) :: $(GHCI_LIBOBJS)
+       ld -r -x -o $@ $(GHCI_LIBOBJS)
+endif
+else # no HS_SRCS
 $(GHCI_LIBRARY) :: $(GHCI_LIBOBJS)
        ld -r -x -o $@ $(GHCI_LIBOBJS)
 endif
@@ -919,17 +924,9 @@ ifneq "$(SGML_DOC)" ""
 # multi-file SGML document: main document name is specified in $(SGML_DOC),
 # sub-documents (.sgml files) listed in $(SGML_SRCS).
 
-ifeq "$(VSGML_SRCS)" ""
-VSGML_SRCS = $(wildcard *.vsgml)
-endif
-
 ifeq "$(SGML_SRCS)" ""
-ifneq "$(VSGML_SRCS)" ""
-SGML_SRCS = $(patsubst %.vsgml, %.sgml, $(VSGML_SRCS))
-else
 SGML_SRCS = $(wildcard *.sgml)
 endif
-endif
 
 SGML_TEX  = $(addsuffix .tex,$(SGML_DOC))
 SGML_DVI  = $(addsuffix .dvi,$(SGML_DOC))
@@ -951,7 +948,6 @@ txt  :: $(SGML_TEXT)
 
 CLEAN_FILES += $(SGML_TEXT) $(SGML_TEX) $(SGML_PS) $(SGML_DVI) $(SGML_PDF) $(SGML_RTF) $(SGML_HTML) $(SGML_DOC)-*.html
 # can't use $(SGML_SRCS) here, it was maybe used elsewhere
-MOSTLY_CLEAN_FILES += $(patsubst %.vsgml, %.sgml, $(VSGML_SRCS))
 
 extraclean ::
        $(RM) -rf DBTOHTML_OUTPUT_*