[project @ 2002-01-30 12:13:11 by simonmar]

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

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 693c6d9..fecfd3a 100644 (file)
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -84,14 +84,14 @@ ifneq "$(BootingFromHc)" "YES"
 
 %.$(way_)hi : %.$(way_)o
        @if [ ! -f $@ ] ; then \
-           echo Panic! $< exists, but $@ does not. \
+           echo Panic! $< exists, but $@ does not.; \
            exit 1; \
        else exit 0 ; \
        fi                                                      
 
 %.$(way_)hi : %.$(way_)hc
        @if [ ! -f $@ ] ; then \
-           echo Panic! $< exists, but $@ does not. \
+           echo Panic! $< exists, but $@ does not.; \
            exit 1; \
        else exit 0 ; \
        fi
@@ -115,6 +115,7 @@ endif # BootingViaC
 ifneq "$(BootingFromHc)" "YES"
 %_hsc.c %_hsc.h %.hs : %.hsc
        $(HSC2HS) $(HSC2HS_OPTS) $<
+       @touch $(patsubst %.hsc,%_hsc.c,$<)
 endif
 
 #-----------------------------------------------------------------------------
@@ -142,6 +143,8 @@ endif
 #-----------------------------------------------------------------------------
 # C-related suffix rules
 
+ifeq "$(UseGhcForCc)" ""
+
 %.$(way_)o : %.$(way_)s
        @$(RM) $@
        $(AS) $(AS_OPTS) -o $@ $< || ( $(RM) $@ && exit 1 )
@@ -154,21 +157,44 @@ endif
        @$(RM) $@
        $(CC) $(CC_OPTS) -c $< -o $@
 
-#%.$(way_)s : %.c
-#      @$(RM) $@
-#      $(CC) $(CC_OPTS) -S $< -o $@
+%.$(way_)s : %.c
+       @$(RM) $@
+       $(CC) $(CC_OPTS) -S $< -o $@
+
+else
 
-%.c : %.flex
+%.$(way_)o : %.$(way_)s
        @$(RM) $@
-       $(FLEX) -t $(FLEX_OPTS) $< > $@ || ( $(RM) $@ && exit 1 )
-%.c : %.lex
+       $(HC) $(GHC_CC_OPTS) -c $< -o $@
+
+%.$(way_)o : %.c
        @$(RM) $@
-       $(FLEX) -t $(FLEX_OPTS) $< > $@ || ( $(RM) $@ && exit 1 )
+       $(HC) $(GHC_CC_OPTS) -c $< -o $@
+
+%.$(way_)o : %.S
+       @$(RM) $@
+       $(HC) $(GHC_CC_OPTS) -c $< -o $@
+
+%.$(way_)s : %.c
+       @$(RM) $@
+       $(HC) $(GHC_CC_OPTS) -c $< -o $@
+
+endif
 
 # stubs are automatically generated and compiled by GHC
 %_stub.$(way_)o: %.o
        @:
 
+# -----------------------------------------------------------------------------
+# Flex/lex
+
+%.c : %.flex
+       @$(RM) $@
+       $(FLEX) -t $(FLEX_OPTS) $< > $@ || ( $(RM) $@ && exit 1 )
+%.c : %.lex
+       @$(RM) $@
+       $(FLEX) -t $(FLEX_OPTS) $< > $@ || ( $(RM) $@ && exit 1 )
+
 #-----------------------------------------------------------------------------
 # Yacc stuff
 
@@ -227,6 +253,8 @@ endif
 #      $(JADE) -t sgml -V html-index -d $(SGMLSTYLESHEET) -c $(DOCBOOK_CATALOG) $<
 #      $(PERL) $(COLLATEINDEX) -N -o index.sgml
        $(SGML2HTML) $(SGML2HTML_OPTS) $<
+# touch the .html file so that it is seen to be built
+       @touch $@
 
 %.html : %.tex
        @$(RM) $@
@@ -270,3 +298,10 @@ endif
 %.$(way_)o : %.$(way_)rc
        @$(RM) $@
        windres $< $@
+
+#-----------------------------------------------------------------------------
+# Preprocessor suffix rule
+
+% : %.pp
+       rm -f $@
+       $(CPP) $(CPP_OPTS) -x c $< | $(SED) -e '/^#/d' > $@