Index: connectivity/inc/connectivity/sqlparse.hxx
===================================================================
RCS file: /cvs/dba/connectivity/inc/connectivity/sqlparse.hxx,v
retrieving revision 1.10.10.1.6.1
diff -u -r1.10.10.1.6.1 sqlparse.hxx
--- connectivity/inc/connectivity/sqlparse.hxx	27 Sep 2002 10:58:12 -0000	1.10.10.1.6.1
+++ connectivity/inc/connectivity/sqlparse.hxx	20 Jan 2003 21:41:17 -0000
@@ -74,7 +74,7 @@
 #ifndef FLEX_SCANNER
 #ifndef BISON_INCLUDED
 #define BISON_INCLUDED
-#include <connectivity/sqlbison.hxx>
+#include <sqlbison.hxx>
 #endif
 #endif
 #endif
Index: connectivity/prj/d.lst
===================================================================
RCS file: /cvs/dba/connectivity/prj/d.lst,v
retrieving revision 1.11.4.1
diff -u -r1.11.4.1 d.lst
--- connectivity/prj/d.lst	26 Nov 2002 14:26:04 -0000	1.11.4.1
+++ connectivity/prj/d.lst	20 Jan 2003 21:41:17 -0000
@@ -21,7 +21,7 @@
 mkdir: %_DEST%\inc%_EXT%\connectivity\sdbcx
 
 hedabu: ..\inc\connectivity\*.hxx %_DEST%\inc%_EXT%\connectivity\*.hxx
-hedabu: ..\%__SRC%\inc\connectivity\sqlbison.hxx %_DEST%\inc%_EXT%\connectivity\sqlbison.hxx
+hedabu: ..\%__SRC%\inc\sqlbison.hxx %_DEST%\inc%_EXT%\connectivity\sqlbison.hxx
 hedabu: ..\inc\connectivity\sdbcx\*.hxx %_DEST%\inc%_EXT%\connectivity\sdbcx\*.hxx
 
 
Index: connectivity/source/parse/makefile.mk
===================================================================
RCS file: /cvs/dba/connectivity/source/parse/makefile.mk,v
retrieving revision 1.8.20.1
diff -u -r1.8.20.1 makefile.mk
--- connectivity/source/parse/makefile.mk	27 Aug 2002 13:10:23 -0000	1.8.20.1
+++ connectivity/source/parse/makefile.mk	20 Jan 2003 21:41:18 -0000
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.8.20.1 $
+#   $Revision: 1.8.20.1.2.1 $
 #
-#   last change: $Author: vg $ $Date: 2002/08/27 13:10:23 $
+#   last change: $Author: armin $ $Date: 2002/10/18 16:14:53 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -67,12 +67,14 @@
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  svpre.mk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
 
 # --- Files --------------------------------------------------------
 
+YACCTARGET= $(MISC)$/sqlbison.cxx
+YACCFILES= sqlbison.y
+YACCFLAGS=-v -d -l -pSQLyy -bsql -o
+
 SLOFILES =  \
 		$(SLO)$/sqlNoException.obj	\
 		$(SLO)$/sqlbison.obj		\
@@ -92,16 +94,8 @@
 
 .INCLUDE :  target.mk
 
-$(MISC)$/sqlflex.cxx:	sqlflex.l
+$(MISC)$/%.cxx:	%.l
 	+flex -i -8 -PSQLyy -L -o$(MISC)$/sqlflex.cxx sqlflex.l
 
-$(MISC)$/sqlbison.cxx: sqlbison.y
-	+bison -v -d -pSQLyy -l -bsql -o$(MISC)$/sqlbison.cxx sqlbison.y
-	-$(MKDIR) $(OUT)$/inc$/connectivity
-	+$(COPY) $(MISC)$/sqlbison.cxx.h $(OUT)$/inc$/connectivity$/sqlbison.hxx
-
-$(SLO)$/sqlbison.obj : $(MISC)$/sqlbison.cxx
-
-$(SLO)$/sqlflex.obj : $(MISC)$/sqlflex.cxx
-
-sqliterator.cxx:	$(MISC)$/sqlbison.cxx
+$(INCCOM)$/sqlbison.hxx : $(YACCTARGET)
+$(EXCEPTIONSFILES) : $(INCCOM)$/sqlbison.hxx
Index: connectivity/source/parse/sqlflex.l
===================================================================
RCS file: /cvs/dba/connectivity/source/parse/sqlflex.l,v
retrieving revision 1.15.12.1
diff -u -r1.15.12.1 sqlflex.l
--- connectivity/source/parse/sqlflex.l	27 Sep 2002 11:05:36 -0000	1.15.12.1
+++ connectivity/source/parse/sqlflex.l	20 Jan 2003 21:41:19 -0000
@@ -38,7 +38,7 @@
 #define SQLYYDEBUG 1
 #endif
 
-#include "connectivity/sqlbison.hxx"
+#include "sqlbison.hxx"
 #endif
 #ifndef _CONNECTIVITY_SQLSCAN_HXX
 #include "sqlscan.hxx"
Index: connectivity/source/parse/sqlnode.cxx
===================================================================
RCS file: /cvs/dba/connectivity/source/parse/sqlnode.cxx,v
retrieving revision 1.26.8.2.2.1.6.1
diff -u -r1.26.8.2.2.1.6.1 sqlnode.cxx
--- connectivity/source/parse/sqlnode.cxx	27 Sep 2002 11:05:37 -0000	1.26.8.2.2.1.6.1
+++ connectivity/source/parse/sqlnode.cxx	20 Jan 2003 21:41:19 -0000
@@ -69,7 +69,7 @@
 #define YYBISON	  1
 #ifndef BISON_INCLUDED
 #define BISON_INCLUDED
-#include <connectivity/sqlbison.hxx>
+#include <sqlbison.hxx>
 #endif
 #ifndef _CONNECTIVITY_SQLPARSE_HXX
 #include <connectivity/sqlparse.hxx>