From 987be617b89dd62884bb2ab1b624a8a9530305aa Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Wed, 28 Feb 2018 16:35:01 -0500
Subject: add ds9 parsers

---
 ds9/make.head.include |  5 -----
 ds9/make.include      | 20 +++++++++-----------
 ds9/unix/Makefile.in  |  5 ++---
 3 files changed, 11 insertions(+), 19 deletions(-)
 delete mode 100644 ds9/make.head.include

diff --git a/ds9/make.head.include b/ds9/make.head.include
deleted file mode 100644
index f90d92b..0000000
--- a/ds9/make.head.include
+++ /dev/null
@@ -1,5 +0,0 @@
-PARSERS = \
-	$(prefix)/ds9/library/zoomparser.tcl \
-	$(prefix)/ds9/library/zoomlex.tcl
-
-
diff --git a/ds9/make.include b/ds9/make.include
index e6071df..28eb376 100644
--- a/ds9/make.include
+++ b/ds9/make.include
@@ -1,17 +1,16 @@
 #--------------------------parsers
 
-parsers : $(PARSERS)
+vpath %.tac $(prefix)/ds9/parsers
+vpath %.fcl $(prefix)/ds9/parsers
 
-$(prefix)/ds9/library/zoomparser.tcl : $(prefix)/ds9/parsers/zoomparser.tac
-	tclsh $(prefix)/taccle/taccle.tcl -p zoom -d -v -w $<
-	mv $(prefix)/ds9/parsers/zoomparser*.tcl $(prefix)/ds9/library/.
+$(prefix)/ds9/library/%parser.tcl : %parser.tac
+	tclsh $(prefix)/taccle/taccle.tcl -p $* -d -v -w $<
+	mv $(prefix)/ds9/parsers/$*parser.tcl $(@D)
+	mv $(prefix)/ds9/parsers/$*parser.tab.tcl $(@D)
 
-$(prefix)/ds9/library/zoomlex.tcl : $(prefix)/ds9/parsers/zoomlex.fcl
-	tclsh $(prefix)/fickle/fickle.tcl -P zoom $<
-	mv $(prefix)/ds9/parsers/zoomlex.tcl $(prefix)/ds9/library/.
-
-#%.tcl: %.fcl
-#%.tcl: %.tac
+$(prefix)/ds9/library/%lex.tcl : %lex.fcl
+	tclsh $(prefix)/fickle/fickle.tcl -P $* $<
+	mv $(prefix)/ds9/parsers/$*lex.tcl $(@D)
 
 #--------------------------framework
 
@@ -87,5 +86,4 @@ distclean: clean
 	-rm -rf autom4te.cache
 
 parsersclean:
-	-rm -f $(prefix)/ds9/library/*.output
 	-rm -f $(prefix)/ds9/parsers/*.output $(prefix)/ds9/parsers/*.tcl
diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in
index be27273..50338f8 100644
--- a/ds9/unix/Makefile.in
+++ b/ds9/unix/Makefile.in
@@ -68,8 +68,6 @@ system		= @system@
 .C.@OBJEXT@:
 	$(COMPILE) -c `@CYGPATH@ $<` -o $@
 
-include ../make.head.include
-
 #--------------------------defines
 
 APPDIR	= zvfsmntpt
@@ -122,7 +120,8 @@ PREQS	= \
 	$(LIBDIR)/tcl$(TCL_VERSION) \
 	$(LIBDIR)/tcl8 \
 	$(LIBDIR)/tk$(TCL_VERSION) \
-	$(PARSERS) \
+	$(prefix)/ds9/parsers/*.tac \
+	$(prefix)/ds9/parsers/*.fcl \
 	$(LIBDIR)/library \
 	$(LIBDIR)/msgs \
 	$(LIBDIR)/doc \
-- 
cgit v0.12