X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpaths.mk;h=720a7508de1d2d22f024d911fb0b883340550b79;hb=e9f0f9d7bcfca13776e7aa465b7ab539a5dace73;hp=bbcdd787d8b403fb3fd2398af98242c18f90399d;hpb=1d280b65bc1e85d27c9037fb765fa415bfad8d09;p=ghc-hetmet.git

diff --git a/mk/paths.mk b/mk/paths.mk
index bbcdd78..720a750 100644
--- a/mk/paths.mk
+++ b/mk/paths.mk
@@ -47,12 +47,13 @@ endif
 SRC_INSTALL_OPTS += $(INSTALL_OWNER) $(INSTALL_GROUP)
 
 #
-# Invocations of `install' for the three different classes
+# Invocations of `install' for the four different classes
 # of targets:
 #
 
 INSTALL_PROGRAM = $(INSTALL) -m 755
 INSTALL_SCRIPT  = $(INSTALL) -m 755
+INSTALL_SHLIB   = $(INSTALL) -m 755
 INSTALL_DATA    = $(INSTALL) -m 644
 INSTALL_DIR     = $(FPTOOLS_TOP)/glafp-utils/mkdirhier/mkdirhier
 
@@ -108,18 +109,57 @@ INSTALL_DIR     = $(FPTOOLS_TOP)/glafp-utils/mkdirhier/mkdirhier
 #             (caveat: assuming no funny use of -hisuf and that
 #               file name and module name match)
 
-PRE_SRCS    = $(wildcard *.lhs *.hs *.c *.prl *.lprl *.lit *.verb *.hsc)
+# NB. use := rather than = here, otherwise the wildcard will get re-computed
+# every time PRE_SRCS is expanded (this happens a lot).
+ALL_SRCS    = $(wildcard $(patsubst ./%, %,  \
+		   $(patsubst %,%/*.hs,   . $(ALL_DIRS)) \
+		   $(patsubst %,%/*.lhs,  . $(ALL_DIRS)) \
+		   $(patsubst %,%/*.y,    . $(ALL_DIRS)) \
+		   $(patsubst %,%/*.ly,   . $(ALL_DIRS)) \
+		   $(patsubst %,%/*.c,    . $(ALL_DIRS)) \
+		   $(patsubst %,%/*.hc,   . $(ALL_DIRS)) \
+		   $(patsubst %,%/*.S,    . $(ALL_DIRS)) \
+		   $(patsubst %,%/*.prl,  . $(ALL_DIRS)) \
+		   $(patsubst %,%/*.lprl, . $(ALL_DIRS)) \
+		   $(patsubst %,%/*.lit,  . $(ALL_DIRS)) \
+		   $(patsubst %,%/*.verb, . $(ALL_DIRS)) \
+		   $(patsubst %,%/*.hsc,  . $(ALL_DIRS)) \
+	       ))
+
+# ALL_SRCS is computed once and for all into PRE_SRCS at the top of target.mk.
+
+PRE_HS_SRCS  = $(filter %.hs,  $(PRE_SRCS))
+PRE_LHS_SRCS = $(filter %.lhs, $(PRE_SRCS))
+
+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)
 
-HSC_SRCS     = $(filter %.hsc, $(PRE_SRCS))
 DERIVED_SRCS = $(patsubst %.hsc, %.hs, $(HSC_SRCS)) \
 	       $(patsubst %.hsc, %_hsc.c, $(HSC_SRCS)) \
-	       $(patsubst %.hsc, %_hsc.h, $(HSC_SRCS))
+	       $(patsubst %.hsc, %_hsc.h, $(HSC_SRCS)) \
+	       $(patsubst %.hsc, %.hc, $(HSC_SRCS)) \
+	       $(patsubst %.y,   %.hs, $(HAPPY_Y_SRCS)) \
+	       $(patsubst %.ly,  %.hs, $(HAPPY_LY_SRCS)) \
+	       $(patsubst %.hs,  %.hc, $(PRE_HS_SRCS)) \
+	       $(patsubst %.lhs, %.hc, $(PRE_LHS_SRCS))
 
 # EXCLUDED_SRCS can be set in the Makefile, otherwise it defaults to empty.
-EXCLUDED_HSC_SRCS     = $(filter %.hsc, $(EXCLUDED_SRCS))
+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_HS_SRCS      = $(filter %.hs,  $(EXCLUDED_SRCS))
+EXCLUDED_LHS_SRCS     = $(filter %.lhs, $(EXCLUDED_SRCS))
 EXCLUDED_DERIVED_SRCS = $(patsubst %.hsc, %.hs, $(EXCLUDED_HSC_SRCS)) \
 			$(patsubst %.hsc, %_hsc.h, $(EXCLUDED_HSC_SRCS)) \
-			$(patsubst %.hsc, %_hsc.c, $(HSC_SRCS))
+			$(patsubst %.hsc, %_hsc.c, $(EXCLUDED_HSC_SRCS)) \
+			$(patsubst %.hsc, %.hc, $(EXCLUDED_HSC_SRCS)) \
+			$(patsubst %.y,   %.hs, $(EXCLUDED_HAPPY_Y_SRCS)) \
+			$(patsubst %.ly,  %.hs, $(EXCLUDED_HAPPY_LY_SRCS)) \
+			$(patsubst %.hs,  %.hc, $(EXCLUDED_HS_SRCS)) \
+			$(patsubst %.lhs, %.hc, $(EXCLUDED_LHS_SRCS))
 # Exclude _hsc.c files; they get built as part of the cbits library,
 # not part of the main library
 
@@ -128,10 +168,8 @@ CLOSED_EXCLUDED_SRCS  = $(sort $(EXCLUDED_SRCS) $(EXCLUDED_DERIVED_SRCS))
 SRCS        = $(filter-out $(CLOSED_EXCLUDED_SRCS), \
 	        $(sort $(PRE_SRCS) $(DERIVED_SRCS)))
 
-HS_SRCS	    = $(filter %.lhs %.hs %.hc,$(sort $(SRCS) $(BOOT_SRCS)))
+HS_SRCS	    = $(filter %.lhs %.hs, $(sort $(SRCS) $(BOOT_SRCS)))
 HS_OBJS     = $(addsuffix .$(way_)o,$(basename $(HS_SRCS)))
-HS_HCS      = $(addsuffix .$(way_)hc,$(basename $(HS_SRCS)))
-HS_SS       = $(addsuffix .$(way_)s,$(basename $(HS_SRCS)))
 HS_IFACES   = $(addsuffix .$(way_)hi,$(basename $(HS_SRCS)))
 
 HSC_C_OBJS  = $(addsuffix _hsc.$(way_)o,$(basename $(filter %.hsc,$(SRCS))))
@@ -196,12 +234,14 @@ TAGS_C_SRCS=$(C_SRCS)
 #
 MOSTLY_CLEAN_FILES += $(HS_OBJS) $(C_OBJS) $(HSC_C_OBJS)
 CLEAN_FILES        += $(HS_PROG) $(C_PROG) $(SCRIPT_PROG) $(SCRIPT_LINK) \
-		      $(PROG) $(LIBRARY) $(HS_IFACES) $(HS_SS) a.out \
-		      $(DERIVED_SRCS)
+		      $(PROG) $(LIBRARY) $(HS_IFACES) a.out \
+		      $(CLEAN_DERIVED_SRCS)
 
 # Don't clean the .hc files if we're bootstrapping
-ifneq "$(BootingFromHc)" "YES"
-CLEAN_FILES += $(HS_HCS)
+ifeq "$(BootingFromHc)" "YES"
+CLEAN_DERIVED_SRCS = $(filter-out %.hc, $(DERIVED_SRCS))
+else
+CLEAN_DERIVED_SRCS = $(DERIVED_SRCS)
 endif
 
 DIST_CLEAN_FILES += .depend