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

diff --git a/mk/paths.mk b/mk/paths.mk
index e73d59f..720a750 100644
--- a/mk/paths.mk
+++ b/mk/paths.mk
@@ -115,6 +115,7 @@ 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)) \
@@ -130,28 +131,34 @@ ALL_SRCS    = $(wildcard $(patsubst ./%, %,  \
 PRE_HS_SRCS  = $(filter %.hs,  $(PRE_SRCS))
 PRE_LHS_SRCS = $(filter %.lhs, $(PRE_SRCS))
 
-HSC_SRCS     = $(filter %.hsc, $(PRE_SRCS))
-HAPPY_SRCS   = $(filter %.y,   $(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)
 
 DERIVED_SRCS = $(patsubst %.hsc, %.hs, $(HSC_SRCS)) \
 	       $(patsubst %.hsc, %_hsc.c, $(HSC_SRCS)) \
 	       $(patsubst %.hsc, %_hsc.h, $(HSC_SRCS)) \
 	       $(patsubst %.hsc, %.hc, $(HSC_SRCS)) \
-	       $(patsubst %.y, %.hs, $(HAPPY_SRCS)) \
-	       $(patsubst %.hs, %.hc, $(PRE_HS_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_HAPPY_SRCS   = $(filter %.y,   $(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, $(EXCLUDED_HSC_SRCS)) \
 			$(patsubst %.hsc, %.hc, $(EXCLUDED_HSC_SRCS)) \
-			$(patsubst %.y, %.hs, $(EXCLUDED_HAPPY_SRCS)) \
-			$(patsubst %.hs, %.hc, $(EXCLUDED_HS_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