[project @ 2002-02-04 22:17:50 by sof]

.y/.ly handling: patsubst'ery broke when HAPPY_SRCS suddenly contained two file extensions; now fixed.

diff --git a/mk/paths.mk b/mk/paths.mk
index a5bf5ed..720a750 100644 (file)
--- a/mk/paths.mk
+++ b/mk/paths.mk
@@ -131,29 +131,33 @@ 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)) $(filter %.ly, $(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 %.ly,  %.hs, $(HAPPY_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)) $(filter %.ly, $(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 %.ly,  %.hs, $(EXCLUDED_HAPPY_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,