qlparser+rasdl special cases (flex+bison)

1 files changed, 51 insertions, 19 deletions

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: