User: obo     
Date: 2006/09/15 06:53:13

Modified:
   dba/connectivity/version.mk

Log:
 INTEGRATION: CWS ause066 (1.13.102); FILE MERGED
 2006/08/30 11:15:13 hjs 1.13.102.2: #i69093# cleanup variable usage
 2006/08/30 10:21:48 oj 1.13.102.1: remove unused defines from version.mk

File Changes:

Directory: /dba/connectivity/
=============================

File [changed]: version.mk
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/version.mk?r1=1.13&r2=1.14
Delta lines:  +0 -64
--------------------
--- version.mk  29 Mar 2006 12:13:12 -0000      1.13
+++ version.mk  15 Sep 2006 13:53:10 -0000      1.14
@@ -44,10 +44,6 @@
 # the micro 
 ADO_MICRO=0
 
-# this is a c++ compatible library 
-ADO_CPP=1
-
-ADO=$(ADO_TARGET_TARGET)_$(CMPEXT)
 
 # ----------------------------ODBC BASE 
settings-----------------------------------#
 # target
@@ -60,10 +56,6 @@
 # the micro 
 ODBC2_MICRO=0
 
-# this is a c++ compatible library 
-ODBC2_CPP=1
-
-ODBC2=$(ODBC2_TARGET_TARGET)_$(CMPEXT)
 
 # ----------------------------ODBC settings-----------------------------------#
 # target
@@ -76,10 +68,6 @@
 # the micro 
 ODBC_MICRO=0
 
-# this is a c++ compatible library 
-ODBC_CPP=1
-
-ODBC=$(ODBC_TARGET_TARGET)_$(CMPEXT)
 
 # ----------------------------JDBC settings-----------------------------------#
 # target
@@ -92,10 +80,6 @@
 # the micro 
 JDBC_MICRO=0
 
-# this is a c++ compatible library 
-JDBC_CPP=1
-
-JDBC=$(JDBC_TARGET_TARGET)_$(CMPEXT)
 
 # ----------------------------ADABAS 
settings-----------------------------------#
 # target
@@ -108,10 +92,6 @@
 # the micro 
 ADABAS_MICRO=0
 
-# this is a c++ compatible library 
-ADABAS_CPP=1
-
-ADABAS=$(ADABAS_TARGET_TARGET)_$(CMPEXT)
 
 # ----------------------------dbtools 
settings-----------------------------------#
 # target
@@ -124,15 +104,6 @@
 # the micro 
 DBTOOLS_MICRO=0
 
-# this is a c++ compatible library 
-DBTOOLS_CPP=1
-
-DBTOOLS=$(DBTOOLS_TARGET_TARGET)_$(CMPEXT)
-
-# ----------------------------conn/res 
settings-----------------------------------#
-# target
-SHARED_RES_TARGET=cnr
-CDEFS+=-DCONN_SHARED_RESOURCE_FILE=$(SHARED_RES_TARGET)
 
 # -----------------------DRIVER MANAGER 
settings--------------------------------#
 # target
@@ -145,10 +116,6 @@
 # the micro 
 SDBC_MICRO=0
 
-# this is a c++ compatible library 
-SDBC_CPP=1
-
-SDBC=$(SDBC_TARGET_TARGET)_$(CMPEXT)
 
 # -----------------------Connection Pool 
settings--------------------------------#
 # target
@@ -161,10 +128,6 @@
 # the micro 
 DBPOOL_MICRO=0
 
-# this is a c++ compatible library 
-DBPOOL_CPP=1
-
-DBPOOL=$(DBPOOL_TARGET_TARGET)_$(CMPEXT)
 
 # ----------------------------DBASE 
settings-----------------------------------#
 # target
@@ -177,17 +140,10 @@
 # the micro 
 DBASE_MICRO=0
 
-# this is a c++ compatible library 
-DBASE_CPP=1
-
-DBASE=$(DBASE_TARGET_TARGET)_$(CMPEXT)
 
 
 
 # ----------------------------MOZAB 
settings-----------------------------------#
-# target
-MOZAB_TARGET=mozab
-
 # the major 
 MOZAB_MAJOR=2
 # the minor 
@@ -195,10 +151,6 @@
 # the micro 
 MOZAB_MICRO=0
 
-# this is a c++ compatible library 
-MOZAB_CPP=1
-
-MOZAB=$(MOZAB_TARGET_TARGET)_$(CMPEXT)
 
 
 # ----------------------------MySQL 
settings-----------------------------------#
@@ -212,10 +164,6 @@
 # the micro 
 MYSQL_MICRO=0
 
-# this is a c++ compatible library 
-MYSQL_CPP=1
-
-MYSQL=$(MYSQL_TARGET_TARGET)_$(CMPEXT)
 
 # ----------------------------Evoab 
settings-----------------------------------#
 # target
@@ -228,10 +176,6 @@
 # the micro 
 EVOAB_MICRO=0
 
-# this is a c++ compatible library 
-EVOAB_CPP=1
-
-EVOAB=$(EVOAB_TARGET_TARGET)_$(CMPEXT)
 
 # ----------------------------Kab 
settings-------------------------------------#
 # target
@@ -244,10 +188,6 @@
 # the micro 
 KAB_MICRO=0
 
-# this is a c++ compatible library 
-KAB_CPP=1
-
-KAB=$(KAB_TARGET_TARGET)_$(CMPEXT)
 
 # ----------------------------HSQLDB 
settings-----------------------------------#
 # target
@@ -260,7 +200,3 @@
 # the micro 
 HSQLDB_MICRO=0
 
-# this is a c++ compatible library 
-HSQLDB_CPP=1
-
-HSQLDB=$(HSQLDB_TARGET_TARGET)_$(CMPEXT)




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

Reply via email to