summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-02-01 17:55:57 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-02-01 17:56:10 +0100
commit9d4fdd4f187ae3082ba5077fbdf33e48aaae3821 (patch)
tree08c98c84cc291bc5b469581c1ed48580e1648072 /connectivity
parent56d652d8a249b10037879b857debd879e262c5cf (diff)
Clean up makefiles
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/dbtools/makefile.mk1
-rw-r--r--connectivity/source/drivers/ado/makefile.mk4
-rw-r--r--connectivity/source/drivers/calc/makefile.mk9
-rw-r--r--connectivity/source/drivers/evoab/makefile.mk5
-rw-r--r--connectivity/source/drivers/evoab2/makefile.mk3
5 files changed, 8 insertions, 14 deletions
diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk
index 1fb9a7130813..1dab5a6f7368 100644
--- a/connectivity/source/dbtools/makefile.mk
+++ b/connectivity/source/dbtools/makefile.mk
@@ -72,7 +72,6 @@ SHL1STDLIBS=\
SHL1STDLIBS+=$(UCBHELPERLIB)
.ENDIF
-#SHL1DEPN=
SHL1IMPLIB= idbtools
SHL1LIBS= $(LIB1TARGET)
diff --git a/connectivity/source/drivers/ado/makefile.mk b/connectivity/source/drivers/ado/makefile.mk
index 54bebe6a2824..77a3147d549b 100644
--- a/connectivity/source/drivers/ado/makefile.mk
+++ b/connectivity/source/drivers/ado/makefile.mk
@@ -31,9 +31,8 @@ PRJNAME=connectivity
TARGET=ado
VISIBILITY_HIDDEN=TRUE
-# ENABLE_EXCEPTIONS=TRUE
-
# --- Settings ----------------------------------
+
.IF "$(DBGUTIL_OJ)"!=""
ENVCFLAGS+=/FR$(SLO)$/
.ENDIF
@@ -97,7 +96,6 @@ SHL1STDLIBS=\
SHL1STDLIBS+= icomphelp2.lib
.ENDIF
-#SHL1DEPN=
SHL1IMPLIB= i$(SHL1TARGET)
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk
index c42d52285fe9..8b5958f30778 100644
--- a/connectivity/source/drivers/calc/makefile.mk
+++ b/connectivity/source/drivers/calc/makefile.mk
@@ -34,6 +34,7 @@ ENABLE_EXCEPTIONS=TRUE
VISIBILITY_HIDDEN=TRUE
# --- Settings ----------------------------------
+
.IF "$(DBGUTIL_OJ)"!=""
ENVCFLAGS+=/FR$(SLO)$/
.ENDIF
@@ -41,7 +42,6 @@ ENVCFLAGS+=/FR$(SLO)$/
.INCLUDE : $(PRJ)$/makefile.pmk
.INCLUDE : $(PRJ)$/version.mk
-
# --- Files -------------------------------------
SLOFILES=\
@@ -76,10 +76,6 @@ SHL1STDLIBS=\
$(COMPHELPERLIB)
-#.IF "$(DBFILELIB)" == ""
-#SHL1STDLIBS+= ifile.lib
-#.ENDIF
-
SHL1DEPN=
SHL1IMPLIB= i$(TARGET)
@@ -88,9 +84,6 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)
DEF1EXPORTFILE= exports.dxp
-
# --- Targets ----------------------------------
.INCLUDE : $(PRJ)$/target.pmk
-
-
diff --git a/connectivity/source/drivers/evoab/makefile.mk b/connectivity/source/drivers/evoab/makefile.mk
index 363b08e40993..82e0ce4b70b0 100644
--- a/connectivity/source/drivers/evoab/makefile.mk
+++ b/connectivity/source/drivers/evoab/makefile.mk
@@ -33,6 +33,7 @@ TARGET=evoab
VISIBILITY_HIDDEN=TRUE
# --- Settings ----------------------------------
+
.IF "$(DBGUTIL_OJ)"!=""
ENVCFLAGS+=/FR$(SLO)$/
.ENDIF
@@ -69,7 +70,7 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
# --- Library -----------------------------------
-#SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
+
SHL1TARGET= $(EVOAB_TARGET)$(DLLPOSTFIX)
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
@@ -100,5 +101,7 @@ DEF1NAME= $(SHL1TARGET)
dummy:
@echo "Nothing to build for GUI $(GUI)"
.ENDIF
+
# --- Targets ----------------------------------
+
.INCLUDE : $(PRJ)$/target.pmk
diff --git a/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk
index 126af9076341..474e001e0926 100644
--- a/connectivity/source/drivers/evoab2/makefile.mk
+++ b/connectivity/source/drivers/evoab2/makefile.mk
@@ -69,7 +69,7 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
# --- Library -----------------------------------
-#SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
+
SHL1TARGET= $(EVOAB_TARGET)$(DLLPOSTFIX)
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
@@ -107,6 +107,7 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)
.ENDIF
+
# --- Targets ----------------------------------
.INCLUDE : $(PRJ)$/target.pmk