X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsuffix.mk;h=fecfd3aa9d3506dcc5881626dc4a430839201631;hb=e9f0f9d7bcfca13776e7aa465b7ab539a5dace73;hp=f4c512648990da19cf3c8e3ab923f633e4359a7b;hpb=ebe6fa3258fc2b0abd237c69727a8eb977b8a590;p=ghc-hetmet.git

diff --git a/mk/suffix.mk b/mk/suffix.mk
index f4c5126..fecfd3a 100644
--- 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
@@ -143,6 +143,8 @@ endif
 #-----------------------------------------------------------------------------
 # C-related suffix rules
 
+ifeq "$(UseGhcForCc)" ""
+
 %.$(way_)o : %.$(way_)s
 	@$(RM) $@
 	$(AS) $(AS_OPTS) -o $@ $< || ( $(RM) $@ && exit 1 )
@@ -155,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
 
@@ -228,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) $@
@@ -271,3 +298,10 @@ endif
 %.$(way_)o : %.$(way_)rc
 	@$(RM) $@
 	windres $< $@
+
+#-----------------------------------------------------------------------------
+# Preprocessor suffix rule
+
+% : %.pp
+	rm -f $@
+	$(CPP) $(CPP_OPTS) -x c $< | $(SED) -e '/^#/d' > $@