From 9d4fdd4f187ae3082ba5077fbdf33e48aaae3821 Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Tue, 1 Feb 2011 17:55:57 +0100
Subject: Clean up makefiles

---
 connectivity/source/dbtools/makefile.mk        | 1 -
 connectivity/source/drivers/ado/makefile.mk    | 4 +---
 connectivity/source/drivers/calc/makefile.mk   | 9 +--------
 connectivity/source/drivers/evoab/makefile.mk  | 5 ++++-
 connectivity/source/drivers/evoab2/makefile.mk | 3 ++-
 5 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'connectivity')

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
-- 
cgit v1.2.3