From 03adec57df0275bdc9f2578be2e81c4e8e03a497 Mon Sep 17 00:00:00 2001 From: sof Date: Sun, 3 Feb 2002 04:44:07 +0000 Subject: [PATCH] [project @ 2002-02-03 04:44:07 by sof] recognize .ly as a happy extension --- mk/paths.mk | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/mk/paths.mk b/mk/paths.mk index e73d59f..a5bf5ed 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)) \ @@ -131,27 +132,29 @@ 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)) +HAPPY_SRCS = $(filter %.y, $(PRE_SRCS)) $(filter %.ly, $(PRE_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_SRCS)) \ + $(patsubst %.ly, %.hs, $(HAPPY_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_HAPPY_SRCS = $(filter %.y, $(EXCLUDED_SRCS)) $(filter %.ly, $(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)) \ $(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_SRCS)) \ + $(patsubst %.ly, %.hs, $(EXCLUDED_HAPPY_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 -- 1.7.10.4