qlparser+rasdl special cases (flex+bison)

2 files changed, 204 insertions, 70 deletions

diff --git a/qlparser/Makefile-files b/qlparser/Makefile-files
index d89fac0..ad8e576 100644
--- a/qlparser/Makefile-files
+++ b/qlparser/Makefile-files
@@ -41,56 +41,158 @@ libqlparser_la_LFLAGS = -i -I
 
 libqlparser_la_CPPFLAGS  = $(AM_CPPFLAGS)
 libqlparser_la_CPPFLAGS += $(BASEDB_CPPFLAGS)
-libqlparser_la_SOURCES=oql.yy lex.ll alloca.c\
-                      symtab.cc symtab.hh \
-                      qtoncstream.cc qtoncstream.hh qtoncstream.icc \
-                      qtmddaccess.cc qtmddaccess.hh qtmddaccess.icc \
-                      qtiterator.cc qtiterator.hh qtiterator.icc \
-                      qtoperationiterator.cc qtoperationiterator.hh qtoperationiterator.icc \
-                      qtselectioniterator.cc qtselectioniterator.hh qtselectioniterator.icc \
-                      qtjoiniterator.cc qtjoiniterator.hh qtjoiniterator.icc \
-                      qtoperation.cc qtoperation.hh qtoperation.icc \
-                      qtbinaryoperation.cc qtbinaryoperation.hh qtbinaryoperation.icc \
-                      qtbinaryinduce.cc qtbinaryinduce.hh qtbinaryinduce.icc \
-                      qtbinaryinduce2.cc qtbinaryinduce2.hh qtbinaryinduce2.icc \
-                      qtunaryoperation.cc qtunaryoperation.hh qtunaryoperation.icc \
-                      qtunaryinduce.cc qtunaryinduce.hh qtunaryinduce.icc \
-                      qtvariable.cc qtvariable.hh qtvariable.icc \
-                      qtconst.cc qtconst.hh qtconst.icc \
-                      qtdata.cc qtdata.hh qtdata.icc \
-                      qtscalardata.cc qtscalardata.hh qtscalardata.icc \
-                      qtatomicdata.cc qtatomicdata.hh qtatomicdata.icc \
-                      qtcomplexdata.cc qtcomplexdata.hh qtcomplexdata.icc \
-                      qtmdd.cc qtmdd.hh qtmdd.icc \
-                      qtstringdata.cc qtstringdata.hh qtstringdata.icc \
-                      qtcondense.cc qtcondense.hh qtcondense.icc \
-                      parseinfo.cc parseinfo.hh parseinfo.icc \
-                      qtdomainoperation.cc qtdomainoperation.hh qtdomainoperation.icc \
-                      qtconversion.cc qtconversion.hh qtconversion.icc\
-                      qtupdate.cc qtupdate.hh qtupdate.icc \
-                      qtinsert.cc qtinsert.hh qtinsert.icc \
-                      qtdelete.cc qtdelete.hh \
-                      qtcommand.cc qtcommand.hh qtcommand.icc \
-                      qtoid.cc qtoid.hh qtoid.icc\
-                      qtintervalop.cc qtintervalop.hh qtintervalop.icc \
-                      qtmintervalop.cc qtmintervalop.hh qtmintervalop.icc \
-                      qtintervaldata.cc qtintervaldata.hh qtintervaldata.icc \
-                      qtpointop.cc qtpointop.hh qtpointop.icc \
-                      qtmintervaldata.cc qtmintervaldata.hh qtmintervaldata.icc \
-                      qtpointdata.cc qtpointdata.hh qtpointdata.icc \
-                      qtnaryoperation.cc qtnaryoperation.hh qtnaryoperation.icc \
-                      qtunaryfunc.cc qtunaryfunc.hh qtunaryfunc.icc \
-                      qtbinaryfunc.cc qtbinaryfunc.hh qtbinaryfunc.icc \
-                      qtmarrayop.cc qtmarrayop.hh qtmarrayop.icc \
-                      qtmarrayop2.cc qtmarrayop2.hh qtmarrayop2.icc \
-                      qtcondenseop.cc qtcondenseop.hh qtcondenseop.icc \
-                      qtnode.cc qtnode.hh qtnode.icc \
-                      querytree.cc querytree.hh querytree.icc \
-                      qtexecute.hh qtdelete.icc \
-					  qtmddconfig.hh qtmddconfig.cc \
-					  qtmddcfgop.hh qtmddcfgop.cc
+libqlparser_la_CPPFLAGS += -I$(srcdir)/qlparser
+libqlparser_la_CPPFLAGS += -Iqlparser
 
-# EXTRA_libqlparser_la_SOURCES = autogen_qtui.hh autogen_qtui.icc autogen_qtui.cc
+libqlparser_la_SOURCES  =
+libqlparser_la_SOURCES += qlparser/alloca.c
+libqlparser_la_SOURCES += qlparser/symtab.cc
+libqlparser_la_SOURCES += qlparser/symtab.hh
+libqlparser_la_SOURCES += qlparser/qtoncstream.cc
+libqlparser_la_SOURCES += qlparser/qtoncstream.hh
+libqlparser_la_SOURCES += qlparser/qtoncstream.icc
+libqlparser_la_SOURCES += qlparser/qtmddaccess.cc
+libqlparser_la_SOURCES += qlparser/qtmddaccess.hh
+libqlparser_la_SOURCES += qlparser/qtmddaccess.icc
+libqlparser_la_SOURCES += qlparser/qtiterator.cc
+libqlparser_la_SOURCES += qlparser/qtiterator.hh
+libqlparser_la_SOURCES += qlparser/qtiterator.icc
+libqlparser_la_SOURCES += qlparser/qtoperationiterator.cc
+libqlparser_la_SOURCES += qlparser/qtoperationiterator.hh
+libqlparser_la_SOURCES += qlparser/qtoperationiterator.icc
+libqlparser_la_SOURCES += qlparser/qtselectioniterator.cc
+libqlparser_la_SOURCES += qlparser/qtselectioniterator.hh
+libqlparser_la_SOURCES += qlparser/qtselectioniterator.icc
+libqlparser_la_SOURCES += qlparser/qtjoiniterator.cc
+libqlparser_la_SOURCES += qlparser/qtjoiniterator.hh
+libqlparser_la_SOURCES += qlparser/qtjoiniterator.icc
+libqlparser_la_SOURCES += qlparser/qtoperation.cc
+libqlparser_la_SOURCES += qlparser/qtoperation.hh
+libqlparser_la_SOURCES += qlparser/qtoperation.icc
+libqlparser_la_SOURCES += qlparser/qtbinaryoperation.cc
+libqlparser_la_SOURCES += qlparser/qtbinaryoperation.hh
+libqlparser_la_SOURCES += qlparser/qtbinaryoperation.icc
+libqlparser_la_SOURCES += qlparser/qtbinaryinduce.cc
+libqlparser_la_SOURCES += qlparser/qtbinaryinduce.hh
+libqlparser_la_SOURCES += qlparser/qtbinaryinduce.icc
+libqlparser_la_SOURCES += qlparser/qtbinaryinduce2.cc
+libqlparser_la_SOURCES += qlparser/qtbinaryinduce2.hh
+libqlparser_la_SOURCES += qlparser/qtbinaryinduce2.icc
+libqlparser_la_SOURCES += qlparser/qtunaryoperation.cc
+libqlparser_la_SOURCES += qlparser/qtunaryoperation.hh
+libqlparser_la_SOURCES += qlparser/qtunaryoperation.icc
+libqlparser_la_SOURCES += qlparser/qtunaryinduce.cc
+libqlparser_la_SOURCES += qlparser/qtunaryinduce.hh
+libqlparser_la_SOURCES += qlparser/qtunaryinduce.icc
+libqlparser_la_SOURCES += qlparser/qtvariable.cc
+libqlparser_la_SOURCES += qlparser/qtvariable.hh
+libqlparser_la_SOURCES += qlparser/qtvariable.icc
+libqlparser_la_SOURCES += qlparser/qtconst.cc
+libqlparser_la_SOURCES += qlparser/qtconst.hh
+libqlparser_la_SOURCES += qlparser/qtconst.icc
+libqlparser_la_SOURCES += qlparser/qtdata.cc
+libqlparser_la_SOURCES += qlparser/qtdata.hh
+libqlparser_la_SOURCES += qlparser/qtdata.icc
+libqlparser_la_SOURCES += qlparser/qtscalardata.cc
+libqlparser_la_SOURCES += qlparser/qtscalardata.hh
+libqlparser_la_SOURCES += qlparser/qtscalardata.icc
+libqlparser_la_SOURCES += qlparser/qtatomicdata.cc
+libqlparser_la_SOURCES += qlparser/qtatomicdata.hh
+libqlparser_la_SOURCES += qlparser/qtatomicdata.icc
+libqlparser_la_SOURCES += qlparser/qtcomplexdata.cc
+libqlparser_la_SOURCES += qlparser/qtcomplexdata.hh
+libqlparser_la_SOURCES += qlparser/qtcomplexdata.icc
+libqlparser_la_SOURCES += qlparser/qtmdd.cc
+libqlparser_la_SOURCES += qlparser/qtmdd.hh
+libqlparser_la_SOURCES += qlparser/qtmdd.icc
+libqlparser_la_SOURCES += qlparser/qtstringdata.cc
+libqlparser_la_SOURCES += qlparser/qtstringdata.hh
+libqlparser_la_SOURCES += qlparser/qtstringdata.icc
+libqlparser_la_SOURCES += qlparser/qtcondense.cc
+libqlparser_la_SOURCES += qlparser/qtcondense.hh
+libqlparser_la_SOURCES += qlparser/qtcondense.icc
+libqlparser_la_SOURCES += qlparser/parseinfo.cc
+libqlparser_la_SOURCES += qlparser/parseinfo.hh
+libqlparser_la_SOURCES += qlparser/parseinfo.icc
+libqlparser_la_SOURCES += qlparser/qtdomainoperation.cc
+libqlparser_la_SOURCES += qlparser/qtdomainoperation.hh
+libqlparser_la_SOURCES += qlparser/qtdomainoperation.icc
+libqlparser_la_SOURCES += qlparser/qtconversion.cc
+libqlparser_la_SOURCES += qlparser/qtconversion.hh
+libqlparser_la_SOURCES += qlparser/qtconversion.icc
+libqlparser_la_SOURCES += qlparser/qtupdate.cc
+libqlparser_la_SOURCES += qlparser/qtupdate.hh
+libqlparser_la_SOURCES += qlparser/qtupdate.icc
+libqlparser_la_SOURCES += qlparser/qtinsert.cc
+libqlparser_la_SOURCES += qlparser/qtinsert.hh
+libqlparser_la_SOURCES += qlparser/qtinsert.icc
+libqlparser_la_SOURCES += qlparser/qtdelete.cc
+libqlparser_la_SOURCES += qlparser/qtdelete.hh
+libqlparser_la_SOURCES += qlparser/qtcommand.cc
+libqlparser_la_SOURCES += qlparser/qtcommand.hh
+libqlparser_la_SOURCES += qlparser/qtcommand.icc
+libqlparser_la_SOURCES += qlparser/qtoid.cc
+libqlparser_la_SOURCES += qlparser/qtoid.hh
+libqlparser_la_SOURCES += qlparser/qtoid.icc
+libqlparser_la_SOURCES += qlparser/qtintervalop.cc
+libqlparser_la_SOURCES += qlparser/qtintervalop.hh
+libqlparser_la_SOURCES += qlparser/qtintervalop.icc
+libqlparser_la_SOURCES += qlparser/qtmintervalop.cc
+libqlparser_la_SOURCES += qlparser/qtmintervalop.hh
+libqlparser_la_SOURCES += qlparser/qtmintervalop.icc
+libqlparser_la_SOURCES += qlparser/qtintervaldata.cc
+libqlparser_la_SOURCES += qlparser/qtintervaldata.hh
+libqlparser_la_SOURCES += qlparser/qtintervaldata.icc
+libqlparser_la_SOURCES += qlparser/qtpointop.cc
+libqlparser_la_SOURCES += qlparser/qtpointop.hh
+libqlparser_la_SOURCES += qlparser/qtpointop.icc
+libqlparser_la_SOURCES += qlparser/qtmintervaldata.cc
+libqlparser_la_SOURCES += qlparser/qtmintervaldata.hh
+libqlparser_la_SOURCES += qlparser/qtmintervaldata.icc
+libqlparser_la_SOURCES += qlparser/qtpointdata.cc
+libqlparser_la_SOURCES += qlparser/qtpointdata.hh
+libqlparser_la_SOURCES += qlparser/qtpointdata.icc
+libqlparser_la_SOURCES += qlparser/qtnaryoperation.cc
+libqlparser_la_SOURCES += qlparser/qtnaryoperation.hh
+libqlparser_la_SOURCES += qlparser/qtnaryoperation.icc
+libqlparser_la_SOURCES += qlparser/qtunaryfunc.cc
+libqlparser_la_SOURCES += qlparser/qtunaryfunc.hh
+libqlparser_la_SOURCES += qlparser/qtunaryfunc.icc
+libqlparser_la_SOURCES += qlparser/qtbinaryfunc.cc
+libqlparser_la_SOURCES += qlparser/qtbinaryfunc.hh
+libqlparser_la_SOURCES += qlparser/qtbinaryfunc.icc
+libqlparser_la_SOURCES += qlparser/qtmarrayop.cc
+libqlparser_la_SOURCES += qlparser/qtmarrayop.hh
+libqlparser_la_SOURCES += qlparser/qtmarrayop.icc
+libqlparser_la_SOURCES += qlparser/qtmarrayop2.cc
+libqlparser_la_SOURCES += qlparser/qtmarrayop2.hh
+libqlparser_la_SOURCES += qlparser/qtmarrayop2.icc
+libqlparser_la_SOURCES += qlparser/qtcondenseop.cc
+libqlparser_la_SOURCES += qlparser/qtcondenseop.hh
+libqlparser_la_SOURCES += qlparser/qtcondenseop.icc
+libqlparser_la_SOURCES += qlparser/qtnode.cc
+libqlparser_la_SOURCES += qlparser/qtnode.hh
+libqlparser_la_SOURCES += qlparser/qtnode.icc
+libqlparser_la_SOURCES += qlparser/querytree.cc
+libqlparser_la_SOURCES += qlparser/querytree.hh
+libqlparser_la_SOURCES += qlparser/querytree.icc
+libqlparser_la_SOURCES += qlparser/qtexecute.hh
+libqlparser_la_SOURCES += qlparser/qtdelete.icc
+libqlparser_la_SOURCES += qlparser/qtmddconfig.hh
+libqlparser_la_SOURCES += qlparser/qtmddconfig.cc
+libqlparser_la_SOURCES += qlparser/qtmddcfgop.hh
+libqlparser_la_SOURCES += qlparser/qtmddcfgop.cc
 
-# BUILT_SOURCES += lex.cc oql.cc oql.h
-# CLEANFILES    += lex.cc oql.cc oql.h
+EXTRA_DIST += qlparser/autogen_qtui.hh
+EXTRA_DIST += qlparser/autogen_qtui.icc
+EXTRA_DIST += qlparser/autogen_qtui.cc
+
+libqlparser_la_SOURCES += qlparser/oql.yy
+libqlparser_la_SOURCES += qlparser/lex.ll
+
+# This is to trick qlparser/oql.h into being built with that name.
+BUILT_SOURCES += qlparser/oql.h
+CLEANFILES    += qlparser/oql.h
+nodist_libqlparser_la_SOURCES = qlparser/oql.h
+qlparser/oql.h: qlparser/libqlparser_la-oql.h
+	cp $< $@
diff --git a/rasdl/Makefile-files b/rasdl/Makefile-files
index 1220a2e..31eb566 100644
--- a/rasdl/Makefile-files
+++ b/rasdl/Makefile-files
@@ -29,29 +29,61 @@
 # 
 ##################################################################
 
-rasdl_LFLAGS = -I
-rasdl_YFLAGS = -d -y
+bin_PROGRAMS += xrasdl
 
-bin_PROGRAMS += rasdl
+xrasdl_LFLAGS = -I
+xrasdl_YFLAGS = -d -y
 
-rasdl_SOURCES=lex.ll odl.yy parse.cc parse.hh symbtbl.cc symbtbl.hh \
-              alloca.cc rasdl.cc rasdl_error.cc rasdl_error.hh \
-              template_inst.hh yparse.hh \
-              ../mymalloc/mymalloc.h ../mymalloc/mymalloc_svc.cc
-rasdl_LDADD = ../reladminif/libreladminif.la ../relmddif/librelmddif.la \
-              ../relstorageif/librelstorageif.la ../relindexif/librelindexif.la \
-              ../relcatalogif/librelcatalogif.la ../relblobif/librelblobif.la \
-              ../indexmgr/libindexmgr.la ../catalogmgr/libcatalogmgr.la \
-              ../storagemgr/libstoragemgr.la ../tilemgr/libtilemgr.la \
-              ../compression/libcompression.la ../commline/libcommline.la ../raslib/libraslib.la \
-              ../conversion/libconversion.la ../rasodmg/librasodmg.la
+xrasdl_SOURCES  =
+xrasdl_SOURCES += rasdl/parse.cc
+xrasdl_SOURCES += rasdl/parse.hh
+xrasdl_SOURCES += rasdl/symbtbl.cc
+xrasdl_SOURCES += rasdl/symbtbl.hh
+xrasdl_SOURCES += rasdl/alloca.cc
+xrasdl_SOURCES += rasdl/rasdl.cc
+xrasdl_SOURCES += rasdl/rasdl_error.cc
+xrasdl_SOURCES += rasdl/rasdl_error.hh
+xrasdl_SOURCES += rasdl/template_inst.hh
+xrasdl_SOURCES += rasdl/yparse.hh
+xrasdl_SOURCES += mymalloc/mymalloc.h
+xrasdl_SOURCES += mymalloc/mymalloc_svc.cc
 
-rasdl_CPPFLAGS  = $(AM_CPPFLAGS)
-rasdl_CPPFLAGS += $(BASEDB_CPPFLAGS)
-rasdl_LDADD    += $(BASEDB_LIBS)
+xrasdl_libs  =
+xrasdl_libs += libreladminif.la
+xrasdl_libs += librelmddif.la
+xrasdl_libs += librelstorageif.la
+xrasdl_libs += librelindexif.la
+xrasdl_libs += librelcatalogif.la
+xrasdl_libs += librelblobif.la
+xrasdl_libs += libindexmgr.la
+xrasdl_libs += libcatalogmgr.la
+xrasdl_libs += libstoragemgr.la
+xrasdl_libs += libtilemgr.la
+xrasdl_libs += libcompression.la
+xrasdl_libs += libcommline.la
+xrasdl_libs += libraslib.la
+xrasdl_libs += libconversion.la
+xrasdl_libs += librasodmg.la
 
-# BUILT_SOURCES=lex.cc odl.cc odl.h
-# CLEANFILES=lex.cc odl.cc odl.h
+xrasdl_LDADD        = $(xrasdl_libs)
+xrasdl_DEPENDENCIES = $(xrasdl_libs)
+
+xrasdl_CPPFLAGS  = $(AM_CPPFLAGS)
+xrasdl_CPPFLAGS += $(BASEDB_CPPFLAGS)
+xrasdl_CPPFLAGS += -I$(srcdir)/rasdl
+xrasdl_CPPFLAGS += -Irasdl
+
+xrasdl_LDADD    += $(BASEDB_LIBS)
+
+xrasdl_SOURCES += rasdl/lex.ll
+xrasdl_SOURCES += rasdl/odl.yy
+
+# This is to trick rasdl/odl.h into being built with that name.
+BUILT_SOURCES += rasdl/odl.h
+CLEANFILES += rasdl/odl.h
+nodist_xrasdl_SOURCES = rasdl/odl.h
+rasdl/odl.h: rasdl/xrasdl-odl.h
+	cp $< $@
 
 #.PHONY : doc
 #doc: