User: obo     
Date: 06/01/19 07:31:46

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

Log:
 INTEGRATION: CWS dba202e (1.2.14); FILE MERGED
 2006/01/18 08:04:16 fs 1.2.14.2: RESYNC: (1.2-1.3); FILE MERGED
 2006/01/10 14:23:26 fs 1.2.14.1: copying fixes for #i59673# and #i60062# to 
this (earlier) CWS

File Changes:

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

File [changed]: makefile.mk
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/makefile.mk?r1=1.3&r2=1.4
Delta lines:  +62 -44
---------------------
--- makefile.mk 10 Jan 2006 14:31:04 -0000      1.3
+++ makefile.mk 19 Jan 2006 15:31:44 -0000      1.4
@@ -37,11 +37,11 @@
 PRJINC=..$/..
 PRJNAME=connectivity
 TARGET=kab
+TARGET2=$(TARGET)drv
+
+ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
 
 .INCLUDE : settings.mk
 .INCLUDE :  $(PRJ)$/version.mk
@@ -50,7 +50,40 @@
 .IF "$(ENABLE_KAB)" == "TRUE"
 # --- Files -------------------------------------
 
-EXCEPTIONSFILES=\
+CFLAGS+=$(KDE_CFLAGS)
+
+# === KAB base library ==========================
+
+# --- Files -------------------------------------
+
+SLOFILES= \
+    $(SLO)$/KDriver.obj     \
+    $(SLO)$/KServices.obj
+
+# --- Library -----------------------------------
+
+SHL1VERSIONMAP=$(TARGET).map
+
+SHL1TARGET= $(TARGET)$(KAB_MAJOR)
+SHL1OBJS=$(SLOFILES)
+SHL1STDLIBS=\
+    $(CPPULIB)                  \
+    $(CPPUHELPERLIB)            \
+    $(OSLLIB)                   \
+    $(SALLIB)
+
+SHL1DEPN=
+SHL1IMPLIB= i$(TARGET)
+
+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
+
+DEF1NAME=   $(SHL1TARGET)
+
+# === KAB impl library ==========================
+
+# --- Files -------------------------------------
+
+SLO2FILES=\
        $(SLO)$/KColumns.obj                    \
        $(SLO)$/KTable.obj                              \
        $(SLO)$/KTables.obj                             \
@@ -60,51 +93,36 @@
        $(SLO)$/KPreparedStatement.obj  \
        $(SLO)$/KDatabaseMetaData.obj   \
        $(SLO)$/KConnection.obj                 \
-       $(SLO)$/KServices.obj                   \
        $(SLO)$/KResultSetMetaData.obj  \
-       $(SLO)$/KDriver.obj                             \
        $(SLO)$/kcondition.obj                  \
        $(SLO)$/korder.obj                              \
        $(SLO)$/kfields.obj                             \
- 
-CFLAGS+=$(KDE_CFLAGS)
-
-SLOFILES=\
-       $(EXCEPTIONSFILES)
+    $(SLO)$/KDEInit.obj
 
 KAB_LIB=$(KDE_LIBS) -lkabc
 
-SHL1VERSIONMAP=$(TARGET).map
-
-
 # --- Library -----------------------------------
 
-SHL1TARGET=    $(KAB_TARGET)$(KAB_MAJOR)
-SHL1OBJS=$(SLOFILES)
-SHL1STDLIBS=\
+SHL2VERSIONMAP=$(TARGET2).map
+
+SHL2TARGET= $(TARGET2)$(KAB_MAJOR)
+SHL2OBJS=$(SLO2FILES)
+SHL2STDLIBS=\
        $(CPPULIB)                                      \
        $(CPPUHELPERLIB)                        \
        $(VOSLIB)                                       \
        $(OSLLIB)                                       \
-       $(SVLLIB)                                       \
-       $(SVLIB)                                        \
-       $(TOOLSLIB)                                     \
-       $(SVTOOLLIB)                            \
-       $(SVTLIB)                                       \
-       $(UNOTOOLSLIB)                          \
-       $(UCBHELPERLIB)                         \
        $(SALLIB)                                       \
        $(DBTOOLSLIB)                           \
        $(COMPHELPERLIB)                        \
        $(KAB_LIB)
 
-SHL1DEPN=
-SHL1IMPLIB=    i$(TARGET)
+SHL2DEPN=
+SHL2IMPLIB= i$(TARGET2)
 
-SHL1DEF=       $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=      $(SHL1TARGET)
+SHL2DEF=    $(MISC)$/$(SHL2TARGET).def
 
+DEF2NAME=   $(SHL2TARGET)
 
 # --- Targets -----------------------------------
 .ELSE          # "$(ENABLE_KAB)" == "TRUE"




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

Reply via email to