diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2018-02-24 21:57:29 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2018-02-24 21:57:29 (GMT) |
| commit | d3a9b9f899af36b50a1f344e34692de035782912 (patch) | |
| tree | b6634b5461c37344d88da5da64156e1722abf104 | |
| parent | 74683dd17324cba287626e4e80ba10fd99843a32 (diff) | |
| download | blt-d3a9b9f899af36b50a1f344e34692de035782912.zip blt-d3a9b9f899af36b50a1f344e34692de035782912.tar.gz blt-d3a9b9f899af36b50a1f344e34692de035782912.tar.bz2 | |
zoom parser
| -rw-r--r-- | ds9/library/source.tcl | 4 | ||||
| -rw-r--r-- | ds9/library/zoomlex.fcl | 2 | ||||
| -rw-r--r-- | ds9/make.include | 17 | ||||
| -rw-r--r-- | ds9/unix/Makefile.in | 1 | ||||
| -rw-r--r-- | make.include | 4 |
5 files changed, 16 insertions, 12 deletions
diff --git a/ds9/library/source.tcl b/ds9/library/source.tcl index f460c27..feba385 100644 --- a/ds9/library/source.tcl +++ b/ds9/library/source.tcl @@ -188,8 +188,8 @@ source $ds9(root)/library/xmfbox.tcl source $ds9(root)/library/xmlrpc.tcl source $ds9(root)/library/xpa.tcl -source $ds9(root)/library/parser.tcl -source $ds9(root)/library/lex.tcl +source $ds9(root)/library/zoomparser.tcl +source $ds9(root)/library/zoomlex.tcl switch [tk windowingsystem] { x11 {} diff --git a/ds9/library/zoomlex.fcl b/ds9/library/zoomlex.fcl index 8d1d10b..79ff034 100644 --- a/ds9/library/zoomlex.fcl +++ b/ds9/library/zoomlex.fcl @@ -1,5 +1,5 @@ %{ -source $ds9(root)/library/parser.tab.tcl +source $ds9(root)/library/zoomparser.tab.tcl %} %option noyywrap diff --git a/ds9/make.include b/ds9/make.include index 7b3684a..4264fdc 100644 --- a/ds9/make.include +++ b/ds9/make.include @@ -1,14 +1,16 @@ #--------------------------parser -%.tcl: %.fcl - tclsh $(prefix)/fickle/fickle.tcl -P zoom $< +libparsers : zoomparser +zoomparser : ../library/zoomparser.tcl ../library/zoomlex.tcl -%.tcl: %.tac +../library/zoomparser.tcl : ../library/zoomparser.tac tclsh $(prefix)/taccle/taccle.tcl -p zoom -d -v -w $< +../library/zoomlex.tcl : ../library/zoomlex.fcl + tclsh $(prefix)/fickle/fickle.tcl -P zoom $< #--------------------------framework -$(LIBDIR)/library : $(prefix)/ds9/library/parser.tcl $(prefix)/ds9/library/parser.tab.tcl $(prefix)/ds9/library/lex.tcl $(prefix)/ds9/library/*.tcl +$(LIBDIR)/library : $(prefix)/ds9/library/*.tcl mkdir -p "$@" cp -p $? "$@" # must do it this way for win @@ -75,10 +77,11 @@ $(LIBDIR)/math : $(prefix)/tcllib/modules/math .PHONY : distclean -distclean: clean parserclean +distclean: clean parsersclean -rm -f Makefile config.cache config.log config.status -rm -rf autom4te.cache -parserclean: - -rm -f ../library/parser.tcl ../library/parser.output ../library/parser.tab.tcl ../library/lex.tcl +parsersclean: + -rm -f ../library/*.output ../library/*.tab.tcl + -rm -f ../library/zoomparser.tcl ../library/zoomlex.tcl diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in index a2841bd..18e0aa7 100644 --- a/ds9/unix/Makefile.in +++ b/ds9/unix/Makefile.in @@ -120,6 +120,7 @@ PREQS = \ $(LIBDIR)/tcl$(TCL_VERSION) \ $(LIBDIR)/tcl8 \ $(LIBDIR)/tk$(TCL_VERSION) \ + libparsers \ $(LIBDIR)/library \ $(LIBDIR)/msgs \ $(LIBDIR)/doc \ diff --git a/make.include b/make.include index 8d73ae8..1d72e36 100644 --- a/make.include +++ b/make.include @@ -457,10 +457,10 @@ ds9clean : @echo "*** $@ ***" $(MAKE) -C ds9/$(OS) clean -ds9parserclean : +ds9parsersclean : @echo "" @echo "*** $@ ***" - $(MAKE) -C ds9/$(OS) parserclean + $(MAKE) -C ds9/$(OS) parsersclean localclean : @echo "" |