[Libreoffice-commits] .: basic/workben desktop/source desktop/win32 editeng/source embeddedobj/util formula/source fpicker/source framework/qa framework/test linguistic/source ucb/workben
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Wed Feb 2 03:12:38 PST 2011
basic/workben/makefile.mk | 10 ----------
desktop/source/deployment/gui/makefile.mk | 3 ---
desktop/source/migration/services/makefile.mk | 3 +--
desktop/win32/source/officeloader/makefile.mk | 18 ------------------
editeng/source/editeng/makefile.mk | 5 -----
editeng/source/items/makefile.mk | 5 -----
editeng/source/misc/makefile.mk | 4 ----
embeddedobj/util/makefile.mk | 2 --
formula/source/ui/resource/makefile.mk | 6 +-----
fpicker/source/unx/kde/makefile.mk | 2 --
fpicker/source/win32/filepicker/makefile.mk | 4 ----
framework/qa/complex/ModuleManager/makefile.mk | 1 +
framework/qa/complex/accelerators/makefile.mk | 1 +
framework/test/makefile.mk | 25 +------------------------
linguistic/source/makefile.mk | 3 ---
ucb/workben/ucb/makefile.mk | 3 ---
16 files changed, 5 insertions(+), 90 deletions(-)
New commits:
commit 080e22b06d6904ab92c0de9f8ec07e254146aaff
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Feb 2 11:48:50 2011 +0100
Clean up makefiles
diff --git a/basic/workben/makefile.mk b/basic/workben/makefile.mk
index 7eb5da3..def3873 100644
--- a/basic/workben/makefile.mk
+++ b/basic/workben/makefile.mk
@@ -51,16 +51,6 @@ APP1STDLIBS= \
$(CPPULIB) \
$(SOTLIB) \
-
-#.IF "$(GUI)"=="WNT" || "$(COM)"=="GCC"
-#APP1STDLIBS+=$(CPPULIB)
-#.ENDIF
-#.IF "$(GUI)"=="UNX"
-#APP1STDLIBS+= \
-# \
-# $(SALLIB)
-#.ENDIF
-
.IF "$(GUI)"!="OS2"
APP1LIBS= \
$(LB)$/basic.lib
diff --git a/desktop/source/deployment/gui/makefile.mk b/desktop/source/deployment/gui/makefile.mk
index 9f1a501..509761c 100644
--- a/desktop/source/deployment/gui/makefile.mk
+++ b/desktop/source/deployment/gui/makefile.mk
@@ -30,7 +30,6 @@ PRJ = ..$/..$/..
PRJNAME = desktop
TARGET = deploymentgui
ENABLE_EXCEPTIONS = TRUE
-#USE_DEFFILE = TRUE
NO_BSYMBOLIC = TRUE
USE_PCH :=
ENABLE_PCH :=
@@ -87,8 +86,6 @@ SHL1LIBS = $(SLB)$/$(TARGET).lib
SHL1DEF = $(MISC)$/$(SHL1TARGET).def
DEF1NAME = $(SHL1TARGET)
-#DEFLIB1NAME = $(TARGET)
-#DEF1DEPN =
SRS1NAME = $(TARGET)
SRC1FILES = \
diff --git a/desktop/source/migration/services/makefile.mk b/desktop/source/migration/services/makefile.mk
index 2f3eb93..35f21ba 100644
--- a/desktop/source/migration/services/makefile.mk
+++ b/desktop/source/migration/services/makefile.mk
@@ -34,6 +34,7 @@ COMP1TYPELIST = migrationoo2
LIBTARGET=NO
# --- Settings -----------------------------------------------------
+
.INCLUDE : ..$/..$/deployment/inc/dp_misc.mk
.INCLUDE : settings.mk
DLLPRE =
@@ -80,7 +81,6 @@ SHL1STDLIBS= \
SHL1DEPN=
SHL1IMPLIB=imigrationoo2
-#SHL1LIBS=$(SLB)$/$(TARGET).lib
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
DEF1NAME=$(SHL1TARGET)
@@ -108,7 +108,6 @@ SHL2STDLIBS= \
SHL2DEPN=
SHL2IMPLIB=imigrationoo3
-#SHL2LIBS=$(SLB)$/$(SHL2TARGET).lib
SHL2DEF=$(MISC)$/$(SHL2TARGET).def
DEF2NAME=$(SHL2TARGET)
diff --git a/desktop/win32/source/officeloader/makefile.mk b/desktop/win32/source/officeloader/makefile.mk
index 1075872..5609dea 100644
--- a/desktop/win32/source/officeloader/makefile.mk
+++ b/desktop/win32/source/officeloader/makefile.mk
@@ -30,7 +30,6 @@ PRJ=..$/..$/..
PRJNAME=desktop
TARGET=officeloader
LIBTARGET=NO
-#TARGETTYPE=GUI
# --- Settings -----------------------------------------------------
@@ -41,23 +40,6 @@ LIBTARGET=NO
OBJFILES = \
$(OBJ)$/officeloader.obj
-#APP1TARGET=so$/officeloader
-#APP1NOSAL=TRUE
-#APP1LINKRES=$(MISC)$/$(TARGET).res
-#APP1ICON=$(SOLARRESDIR)$/icons/001_star_main.ico
-#APP1OBJS = \
-# $(OBJ)$/officeloader.obj
-
-#APP2TARGET=officeloader
-#APP2NOSAL=TRUE
-#APP2LINKRES=$(MISC)$/$(TARGET).res
-#APP2ICON=$(SOLARRESDIR)$/icons/ooo_gulls.ico
-#APP2OBJS = \
-# $(OBJ)$/officeloader.obj
-
-
# --- Targets ------------------------------------------------------
-
.INCLUDE : target.mk
-
diff --git a/editeng/source/editeng/makefile.mk b/editeng/source/editeng/makefile.mk
index 4a8f8f2..e0c0076 100644
--- a/editeng/source/editeng/makefile.mk
+++ b/editeng/source/editeng/makefile.mk
@@ -30,13 +30,8 @@ PRJNAME=editeng
TARGET=editeng
AUTOSEG=true
-#PROJECTPCH4DLL=TRUE
-#PROJECTPCH=eeng_pch
-#PROJECTPCHSOURCE=eeng_pch
-
ENABLE_EXCEPTIONS=TRUE
-
# --- Settings -----------------------------------------------------------
.INCLUDE : settings.mk
diff --git a/editeng/source/items/makefile.mk b/editeng/source/items/makefile.mk
index 0caa661..350d9cb 100644
--- a/editeng/source/items/makefile.mk
+++ b/editeng/source/items/makefile.mk
@@ -27,11 +27,6 @@
PRJ=..$/..
-#PROJECTPCH4DLL=TRUE
-#PROJECTPCH=svxpch
-#PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch
-#ENABLE_EXCEPTIONS=TRUE
-
PRJNAME=editeng
TARGET=items
diff --git a/editeng/source/misc/makefile.mk b/editeng/source/misc/makefile.mk
index e402ae5..23bdb9c 100644
--- a/editeng/source/misc/makefile.mk
+++ b/editeng/source/misc/makefile.mk
@@ -29,10 +29,6 @@ PRJ=..$/..
PRJNAME=editeng
TARGET=misc
-#PROJECTPCH4DLL=TRUE
-#PROJECTPCH=eeng_pch
-#PROJECTPCHSOURCE=eeng_pch
-
ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------------
diff --git a/embeddedobj/util/makefile.mk b/embeddedobj/util/makefile.mk
index 763d64c..d2563fb 100644
--- a/embeddedobj/util/makefile.mk
+++ b/embeddedobj/util/makefile.mk
@@ -29,8 +29,6 @@ PRJ=..
PRJNAME=embeddedobj
TARGET=embobj
-#LIBTARGET=NO
-#USE_DEFFILE=TRUE
ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------------
diff --git a/formula/source/ui/resource/makefile.mk b/formula/source/ui/resource/makefile.mk
index 602359e..fd6a535 100644
--- a/formula/source/ui/resource/makefile.mk
+++ b/formula/source/ui/resource/makefile.mk
@@ -30,6 +30,7 @@ PRJINC=$(PRJ)$/source
PRJNAME=formula
TARGET=ui_resource
ENABLE_EXCEPTIONS=TRUE
+
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
@@ -37,11 +38,6 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-#SRS1NAME=ui_res
-#SRC1FILES= \
-# ui_resource.src
-
-
SLOFILES= $(SLO)$/ModuleHelper.obj \
# --- Targets ----------------------------------
diff --git a/fpicker/source/unx/kde/makefile.mk b/fpicker/source/unx/kde/makefile.mk
index e7fbd2b..e1bc4db 100644
--- a/fpicker/source/unx/kde/makefile.mk
+++ b/fpicker/source/unx/kde/makefile.mk
@@ -32,8 +32,6 @@ TARGET=kdefilepicker
LIBTARGET=NO
ENABLE_EXCEPTIONS=TRUE
EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-#COMP1TYPELIST=$(TARGET)
-#COMPRDB=$(SOLARBINDIR)$/types.rdb
# --- Settings -----------------------------------------------------
diff --git a/fpicker/source/win32/filepicker/makefile.mk b/fpicker/source/win32/filepicker/makefile.mk
index 17e4f26..bfe5bee 100644
--- a/fpicker/source/win32/filepicker/makefile.mk
+++ b/fpicker/source/win32/filepicker/makefile.mk
@@ -29,7 +29,6 @@ PRJ=..$/..$/..
PRJNAME=fpicker
TARGET=fps
-#LIBTARGET=NO
ENABLE_EXCEPTIONS=TRUE
COMP1TYPELIST=$(TARGET)
@@ -41,11 +40,8 @@ COMP1TYPELIST=$(TARGET)
CDEFS+=-D_UNICODE
CDEFS+=-DUNICODE
-#CDEFS+=-DWIN32_LEAN_AND_MEAN
-#CDEFS+=-DWIN32
CDEFS+=-U_WIN32_WINNT -D_WIN32_WINNT=0x0600
-
# --- Resources ----------------------------------------------------
.IF "$(GUI)" == "WNT"
diff --git a/framework/qa/complex/ModuleManager/makefile.mk b/framework/qa/complex/ModuleManager/makefile.mk
index bcef75f..ec11ef5 100644
--- a/framework/qa/complex/ModuleManager/makefile.mk
+++ b/framework/qa/complex/ModuleManager/makefile.mk
@@ -30,6 +30,7 @@ PRJNAME = $(TARGET)
PACKAGE = complex$/ModuleManager
# --- Settings -----------------------------------------------------
+
.INCLUDE: settings.mk
#----- compile .java files -----------------------------------------
diff --git a/framework/qa/complex/accelerators/makefile.mk b/framework/qa/complex/accelerators/makefile.mk
index 3af4961..034287f 100644
--- a/framework/qa/complex/accelerators/makefile.mk
+++ b/framework/qa/complex/accelerators/makefile.mk
@@ -31,6 +31,7 @@ PRJNAME = $(TARGET)
PACKAGE = complex$/accelerators
# --- Settings -----------------------------------------------------
+
.INCLUDE: settings.mk
#----- compile .java files -----------------------------------------
diff --git a/framework/test/makefile.mk b/framework/test/makefile.mk
index 1059cbc..df4adda 100644
--- a/framework/test/makefile.mk
+++ b/framework/test/makefile.mk
@@ -24,6 +24,7 @@
# for a copy of the LGPLv3 License.
#
#*************************************************************************
+
PRJ=..
PRJNAME= framework
@@ -36,29 +37,6 @@ USE_DEFFILE= TRUE
.INCLUDE : settings.mk
-# --- applikation: "test" --------------------------------------------------
-
-#APP1TARGET= test
-
-#APP1OBJS= $(SLO)$/test.obj
-#DEPOBJFILES+= $(APP1OBJS)
-
-#APP1LIBS= $(SLB)$/fwk_classes.lib \
-# $(SLB)$/fwk_helper.lib
-
-#APP1STDLIBS= $(CPPULIB) \
-# $(CPPUHELPERLIB) \
-# $(SALLIB) \
-# \
-# $(TOOLSLIB) \
-# $(SVTOOLLIB) \
-# $(TKLIB) \
-# $(COMPHELPERLIB) \
-# $(VCLLIB)
-
-#APP1DEPN= $(SLB)$/fwk_helper.lib \
-# $(SLB)$/fwk_classes.lib
-
# --- application: "threadtest" --------------------------------------------------
APP2TARGET= threadtest
@@ -90,4 +68,3 @@ APP2DEPN= $(SLO)$/fairrwlock.obj \
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-
diff --git a/linguistic/source/makefile.mk b/linguistic/source/makefile.mk
index 47c8ef3..da6277d 100644
--- a/linguistic/source/makefile.mk
+++ b/linguistic/source/makefile.mk
@@ -78,7 +78,6 @@ SHL1STDLIBS= \
SHL1LIBS= $(SLB)$/$(TARGET).lib
SHL1DEPN= $(SLB)$/$(TARGET).lib
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-#SHL1VERSIONMAP= $(TARGET).map
SHL1IMPLIB= ilng
# build DEF file
@@ -86,7 +85,6 @@ DEF1NAME =$(SHL1TARGET)
DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt
DEFLIB1NAME =$(TARGET)
DEF1DES =Linguistic main DLL
-#DEF1EXPORTFILE= exports.dxp
.IF "$(GUI)"=="WNT"
@@ -97,7 +95,6 @@ DEF1EXPORT3 = component_getImplementationEnvironment
# --- Targets ------------------------------------------------------
-
.INCLUDE : target.mk
diff --git a/ucb/workben/ucb/makefile.mk b/ucb/workben/ucb/makefile.mk
index 54f100b..a711ef7 100644
--- a/ucb/workben/ucb/makefile.mk
+++ b/ucb/workben/ucb/makefile.mk
@@ -44,8 +44,6 @@ OBJFILES=\
$(OBJ)$/srcharg.obj \
$(OBJ)$/ucbdemo.obj
-#SRSFILES= $(SRS)$/ucbdemo.srs
-
#
# UCBDEMO
#
@@ -53,7 +51,6 @@ APP1TARGET= ucbdemo
APP1OBJS=\
$(OBJ)$/srcharg.obj \
$(OBJ)$/ucbdemo.obj
-#APP1RES= $(RES)$/ucbdemo.res
.IF "$(COMPHELPERLIB)"==""
More information about the Libreoffice-commits
mailing list