X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpaths.mk;h=9955af3884096f22d12ecfddcb6aa2543cdb447e;hb=776afe7766a4fe991dbb5a38595900ebd95d4d5a;hp=e64f1ecac2145909437702e24f5554c52d3c190e;hpb=dfc15b64151029dd51c423ec5e7baf6096d1ba3f;p=ghc-hetmet.git

diff --git a/mk/paths.mk b/mk/paths.mk
index e64f1ec..9955af3 100644
--- a/mk/paths.mk
+++ b/mk/paths.mk
@@ -111,6 +111,7 @@ ALL_SRCS    = $(wildcard $(patsubst ./%, %,  \
 		   $(patsubst %,%/*.lhs,  . $(ALL_DIRS)) \
 		   $(patsubst %,%/*.y,    . $(ALL_DIRS)) \
 		   $(patsubst %,%/*.ly,   . $(ALL_DIRS)) \
+		   $(patsubst %,%/*.x,    . $(ALL_DIRS)) \
 		   $(patsubst %,%/*.c,    . $(ALL_DIRS)) \
 		   $(patsubst %,%/*.hc,   . $(ALL_DIRS)) \
 		   $(patsubst %,%/*.S,    . $(ALL_DIRS)) \
@@ -136,6 +137,7 @@ HSC_SRCS      = $(filter %.hsc, $(PRE_SRCS))
 HAPPY_Y_SRCS  = $(filter %.y,   $(PRE_SRCS))
 HAPPY_LY_SRCS = $(filter %.ly,   $(PRE_SRCS))
 HAPPY_SRCS    = $(HAPPY_Y_SRCS) $(HAPPY_LY_SRCS)
+ALEX_SRCS     = $(filter %.x,   $(PRE_SRCS))
 
 DERIVED_GC_SRCS       = $(patsubst %.gc, %.hs, $(GC_SRCS)) \
 			$(patsubst %.gc, %_stub_ffi.c, $(GC_SRCS)) \
@@ -149,12 +151,15 @@ DERIVED_HSC_SRCS      = $(patsubst %.hsc, %.hs, $(HSC_SRCS)) \
 DERIVED_HAPPY_SRCS    = $(patsubst %.y,   %.hs, $(HAPPY_Y_SRCS)) \
 			$(patsubst %.ly,  %.hs, $(HAPPY_LY_SRCS))
 
+DERIVED_ALEX_SRCS     = $(patsubst %.x,   %.hs, $(ALEX_SRCS))
+
 DERIVED_HC_SRCS       = $(patsubst %.hs,  %.hc, $(PRE_HS_SRCS)) \
 			$(patsubst %.lhs, %.hc, $(PRE_LHS_SRCS))
 
 DERIVED_SRCS	      = $(DERIVED_GC_SRCS) \
 			$(DERIVED_HSC_SRCS) \
 			$(DERIVED_HAPPY_SRCS) \
+			$(DERIVED_ALEX_SRCS) \
 			$(DERIVED_HC_SRCS)
 
 # EXCLUDED_SRCS can be set in the Makefile, otherwise it defaults to empty.
@@ -163,6 +168,7 @@ EXCLUDED_HSC_SRCS      = $(filter %.hsc, $(EXCLUDED_SRCS))
 EXCLUDED_HAPPY_Y_SRCS  = $(filter %.y,   $(EXCLUDED_SRCS))
 EXCLUDED_HAPPY_LY_SRCS = $(filter %.ly,  $(EXCLUDED_SRCS))
 EXCLUDED_HAPPY_SRCS   = $(EXCLUDED_HAPPY_Y_SRCS) $(EXCLUDED_HAPPY_LY_SRCS)
+EXCLUDED_ALEX_SRCS    = $(filter %.x,   $(EXCLUDED_SRCS))
 EXCLUDED_HS_SRCS      = $(filter %.hs,  $(EXCLUDED_SRCS))
 EXCLUDED_LHS_SRCS     = $(filter %.lhs, $(EXCLUDED_SRCS))
 EXCLUDED_DERIVED_SRCS = $(patsubst %.hsc, %.hs, $(EXCLUDED_HSC_SRCS)) \
@@ -173,6 +179,7 @@ EXCLUDED_DERIVED_SRCS = $(patsubst %.hsc, %.hs, $(EXCLUDED_HSC_SRCS)) \
 			$(patsubst %.gc,  %_stub_ffi.h, $(EXCLUDED_GC_SRCS)) \
                         $(patsubst %.y,   %.hs, $(EXCLUDED_HAPPY_Y_SRCS)) \
 			$(patsubst %.ly,  %.hs, $(EXCLUDED_HAPPY_LY_SRCS)) \
+                        $(patsubst %.x,   %.hs, $(EXCLUDED_ALEX_SRCS)) \
 			$(patsubst %.hs,  %.hc, $(EXCLUDED_HS_SRCS)) \
 			$(patsubst %.lhs, %.hc, $(EXCLUDED_LHS_SRCS)) \
 			$(patsubst %.hs,  %_stub.c, $(EXCLUDED_HS_SRCS)) \
@@ -193,12 +200,14 @@ HS_IFACES   = $(addsuffix .$(way_)hi,$(basename $(HS_SRCS)))
 GC_C_OBJS   = $(addsuffix _stub_ffi.$(way_)o,$(basename $(filter %.gc,$(SRCS))))
 HSC_C_OBJS  = $(addsuffix _hsc.$(way_)o,$(basename $(filter %.hsc,$(SRCS))))
 
-# Always remove $(EXCLUDED_C_SRCS) from C_SRCS
+ifeq "$(BootingFromHc)" "NO"
+# We don't want to build the _stub.c files ourselves, unless we're
+# bootstrapping from .hc files.
 EXCLUDED_C_SRCS = $(patsubst %.lhs, %_stub.c, $(HS_SRCS)) \
 		  $(patsubst %.hs,  %_stub.c, $(HS_SRCS)) \
 		  $(patsubst %.gc, %_stub_ffi.c, $(GC_SRCS)) \
 		  $(patsubst %.gc, %_stub_ffi.h, $(GC_SRCS))
-
+endif
 
 C_SRCS      = $(filter-out $(EXCLUDED_C_SRCS),$(filter %.c,$(SRCS)))
 C_OBJS      = $(addsuffix .$(way_)o,$(basename $(C_SRCS)))
@@ -208,8 +217,7 @@ C_OBJS      = $(addsuffix .$(way_)o,$(basename $(C_SRCS)))
 SCRIPT_SRCS = $(filter %.lprl,$(SRCS))
 SCRIPT_OBJS = $(addsuffix .prl,$(basename $(SCRIPT_SRCS)))
 
-OBJS        = $(HS_OBJS) $(C_OBJS) $(SCRIPT_OBJS)
-STUBOBJS    = $(GC_C_OBJS) 
+OBJS        = $(HS_OBJS) $(C_OBJS) $(GC_C_OBJS) 
 
 # The default is for $(LIBOBJS) to be the same as $(OBJS)
 LIBOBJS	    = $(OBJS)
@@ -262,6 +270,10 @@ TAGS_C_SRCS=$(C_SRCS)
 #                        that may require extra tools to create.
 #
 #
+# NOTE: $(SCRIPT_OBJS) is not in MOSTLY_CLEAN_FILES, because in some
+# places in the tree it appears that we have source files in $(SCRIPT_OBJS).
+# Specifically glafp-utils/mkdependC/mkdependC.prl and others in ghc/driver and
+# possibly others elsewhere in the tree.  ToDo: fix this properly.
 MOSTLY_CLEAN_FILES += $(HS_OBJS) $(C_OBJS) $(HSC_C_OBJS) $(GC_C_OBJS)
 CLEAN_FILES        += $(HS_PROG) $(C_PROG) $(SCRIPT_PROG) $(SCRIPT_LINK) \
 		      $(PROG) $(LIBRARY) a.out \
@@ -280,7 +292,7 @@ endif
 
 DIST_CLEAN_FILES 	+= .depend* *.hp *.prof
 
-MAINTAINER_CLEAN_FILES 	+= $(BOOT_SRCS) $(DERIVED_HAPPY_SRCS)
+MAINTAINER_CLEAN_FILES 	+= $(BOOT_SRCS) $(DERIVED_HAPPY_SRCS) $(DERIVED_ALEX_SRCS)
 
 #
 # `Standard' set of files to clean out.