Tag: cws_src680_ause066 User: oj Date: 2006/08/30 03:21:51 Modified: dba/connectivity/version.mk dba/connectivity/source/drivers/ado/makefile.mk dba/connectivity/source/drivers/mozab/makefile.mk dba/connectivity/source/resource/makefile.mk
Log: 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.13.102.1 Delta lines: +3 -64 -------------------- --- version.mk 29 Mar 2006 12:13:12 -0000 1.13 +++ version.mk 30 Aug 2006 10:21:48 -0000 1.13.102.1 @@ -4,9 +4,9 @@ # # $RCSfile: version.mk,v $ # -# $Revision: 1.13 $ +# $Revision: 1.13.102.1 $ # -# last change: $Author: obo $ $Date: 2006/03/29 12:13:12 $ +# last change: $Author: oj $ $Date: 2006/08/30 10:21:48 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -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,9 @@ # 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 +119,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 +131,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 +143,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 +154,6 @@ # the micro MOZAB_MICRO=0 -# this is a c++ compatible library -MOZAB_CPP=1 - -MOZAB=$(MOZAB_TARGET_TARGET)_$(CMPEXT) # ----------------------------MySQL settings-----------------------------------# @@ -212,10 +167,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 +179,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 +191,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 +203,3 @@ # the micro HSQLDB_MICRO=0 -# this is a c++ compatible library -HSQLDB_CPP=1 - -HSQLDB=$(HSQLDB_TARGET_TARGET)_$(CMPEXT) Directory: /dba/connectivity/source/drivers/ado/ ================================================ File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/makefile.mk?r1=1.9&r2=1.9.170.1 Delta lines: +9 -35 -------------------- --- makefile.mk 8 Sep 2005 05:33:41 -0000 1.9 +++ makefile.mk 30 Aug 2006 10:21:48 -0000 1.9.170.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.9.170.1 $ # -# last change: $Author: rt $ $Date: 2005/09/08 05:33:41 $ +# last change: $Author: oj $ $Date: 2006/08/30 10:21:48 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -52,38 +52,6 @@ # --- Files ------------------------------------- -SLOFILES=\ - $(SLO)$/ADatabaseMetaDataImpl.obj \ - $(SLO)$/Aolevariant.obj \ - $(SLO)$/Awrapado.obj \ - $(SLO)$/ADatabaseMetaData.obj \ - $(SLO)$/AColumn.obj \ - $(SLO)$/AColumns.obj \ - $(SLO)$/AIndex.obj \ - $(SLO)$/AIndexes.obj \ - $(SLO)$/AKey.obj \ - $(SLO)$/AKeys.obj \ - $(SLO)$/AUser.obj \ - $(SLO)$/AUsers.obj \ - $(SLO)$/AGroup.obj \ - $(SLO)$/AGroups.obj \ - $(SLO)$/ACatalog.obj \ - $(SLO)$/AView.obj \ - $(SLO)$/AViews.obj \ - $(SLO)$/ATable.obj \ - $(SLO)$/ATables.obj \ - $(SLO)$/ACallableStatement.obj \ - $(SLO)$/ADatabaseMetaDataResultSetMetaData.obj \ - $(SLO)$/ADatabaseMetaDataResultSet.obj \ - $(SLO)$/AResultSet.obj \ - $(SLO)$/AConnection.obj \ - $(SLO)$/AStatement.obj \ - $(SLO)$/APreparedStatement.obj \ - $(SLO)$/AResultSetMetaData.obj \ - $(SLO)$/ADriver.obj \ - $(SLO)$/Aservices.obj \ - $(SLO)$/adoimp.obj - EXCEPTIONSFILES= \ $(SLO)$/ADatabaseMetaData.obj \ $(SLO)$/AColumn.obj \ @@ -112,6 +80,12 @@ $(SLO)$/ADriver.obj \ $(SLO)$/Aservices.obj +SLOFILES=\ + $(EXCEPTIONSFILES) \ + $(SLO)$/ADatabaseMetaDataImpl.obj \ + $(SLO)$/Aolevariant.obj \ + $(SLO)$/Awrapado.obj \ + $(SLO)$/adoimp.obj # --- Library ----------------------------------- SHL1TARGET= $(ADO_TARGET)$(ADO_MAJOR) Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/makefile.mk?r1=1.21&r2=1.21.144.1 Delta lines: +5 -5 ------------------- --- makefile.mk 21 Dec 2005 13:17:39 -0000 1.21 +++ makefile.mk 30 Aug 2006 10:21:48 -0000 1.21.144.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.21 $ +# $Revision: 1.21.144.1 $ # -# last change: $Author: obo $ $Date: 2005/12/21 13:17:39 $ +# last change: $Author: oj $ $Date: 2006/08/30 10:21:48 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -35,8 +35,8 @@ PRJ=..$/..$/.. PRJINC=..$/.. PRJNAME=connectivity -TARGET=$(MOZAB_TARGET) -TARGET2=$(MOZAB_TARGET)drv +TARGET=mozab +TARGET2=$(TARGET)drv .IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" all: Directory: /dba/connectivity/source/resource/ ============================================= File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/resource/makefile.mk?r1=1.5&r2=1.5.64.1 Delta lines: +5 -4 ------------------- --- makefile.mk 20 Jun 2006 02:09:36 -0000 1.5 +++ makefile.mk 30 Aug 2006 10:21:48 -0000 1.5.64.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.5.64.1 $ # -# last change: $Author: hr $ $Date: 2006/06/20 02:09:36 $ +# last change: $Author: oj $ $Date: 2006/08/30 10:21:48 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -36,7 +36,8 @@ PRJ=..$/.. PRJINC=.. PRJNAME=connectivity -TARGET=$(SHARED_RES_TARGET) +TARGET=cnr +CDEFS+=-DCONN_SHARED_RESOURCE_FILE=$(TARGET) ENABLE_EXCEPTIONS=TRUE --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
