Tag: cws_src680_sqlite
User: aklitzing
Date: 2006/08/18 11:50:48

Modified:
   dba/connectivity/source/drivers/sqlite3/makefile.mk

Log:
 * Changed version-counting to use only one constant
 * sqQueryPreparedCursor added
 * Linux didn't find the *.so fixed

File Changes:

Directory: /dba/connectivity/source/drivers/sqlite3/
====================================================

File [changed]: makefile.mk
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/sqlite3/makefile.mk?r1=1.1.2.3&r2=1.1.2.4
Delta lines:  +24 -20
---------------------
--- makefile.mk 18 Aug 2006 05:47:56 -0000      1.1.2.3
+++ makefile.mk 18 Aug 2006 18:50:45 -0000      1.1.2.4
@@ -25,9 +25,11 @@
 
 # uno component naming scheme
 # DLLPRE= 
-SQLITE3_SDBC_MAJOR=0
-SQLITE3_SDBC_MINOR=4
-SQLITE3_SDBC_MICRO=0
+
+# Version
+SQLITE3_MAJOR=0
+SQLITE3_MINOR=4
+SQLITE3_MICRO=4
 
 
 # use the static version 
@@ -38,12 +40,13 @@
 SQLITELIB= -lsqlite3 -lvos3gcc3
 .ENDIF
 
-CFLAGS+=-I$(SOLARINCDIR)$/sqlite \
+CFLAGS+=-I$(SOLARINCDIR)$/sqlite3 \
                -DSQL=1 \
-        -DSQLITE_ENABLE_COLUMN_METADATA\
-       -DSQLITE_SDBC_MAJOR=$(SQLITE3_SDBC_MAJOR) \
-       -DSQLITE_SDBC_MINOR=$(SQLITE3_SDBC_MINOR) \
-       -DSQLITE_SDBC_MICRO=$(SQLITE3_SDBC_MICRO)
+               -DSQLITE_ENABLE_COLUMN_METADATA \
+               -DSQLITE3_MAJOR=$(SQLITE3_MAJOR) \
+               -DSQLITE3_MINOR=$(SQLITE3_MINOR) \
+               -DSQLITE3_MICRO=$(SQLITE3_MICRO) \
+               
-DSQLITE3_VERSION=\"$(SQLITE3_MAJOR).$(SQLITE3_MINOR).$(SQLITE3_MICRO)\"
 
 SLOFILES= \
                $(SLO)$/sqDriver.obj            \
@@ -56,8 +59,9 @@
                $(SLO)$/sqDatabaseMetaData.obj  \
                $(SLO)$/sqDB.obj                \
                $(SLO)$/sqQuery.obj             \
+               $(SLO)$/sqQueryTable.obj                \
                $(SLO)$/sqQueryPrepared.obj     \
-               $(SLO)$/sqQueryTable.obj
+               $(SLO)$/sqQueryPreparedCursor.obj
 
 SHL1VERSIONMAP=$(SOLARENV)$/src$/component.map
 SHL1TARGET=$(TARGET)-sdbc.uno
@@ -76,7 +80,7 @@
 SHL1DEF=       $(MISC)$/$(SHL1TARGET).def
 DEF1NAME=      $(SHL1TARGET)
 
-DRIVERNAME=$(TARGET)-sdbc-$(SQLITE3_SDBC_MAJOR).$(SQLITE3_SDBC_MINOR).$(SQLITE3_SDBC_MICRO).zip
+DRIVERNAME=$(TARGET)-sdbc-$(SQLITE3_MAJOR).$(SQLITE3_MINOR).$(SQLITE3_MICRO).zip
 ALLTAR : $(DLLDEST)$/$(DRIVERNAME)
 
 # --- Targets ------------------------------------------------------
@@ -87,7 +91,7 @@
                $(DLLDEST)$/$(DLLPRE)$(SHL1TARGET)$(DLLPOST)
        $(eq,$(SHELL),$(COMSPEC) +copy cp) DataAccess.xcu $(DLLDEST)$
        +cd $(DLLDEST)$ && zip -r $(DRIVERNAME) DataAccess.xcu \
-               $(SHL1TARGET)$(DLLPOST)
+               lib$(SHL1TARGET)$(DLLPOST)
 
 strip :
 .IF "$(GUI)"!="WNT"




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to