summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-06-09 12:12:57 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-06-09 12:12:57 +0000
commitc04a52b24bdce1b486ffbb29e00f0bbb3efa4974 (patch)
tree851d236e09f9953fb71d943982bb76d8f4cc772d
parenta5e220a044dad29c9c26e9b2de2188fbe41f7144 (diff)
INTEGRATION: CWS sb87 (1.3.8); FILE MERGED
2008/04/24 13:15:17 sb 1.3.8.3: RESYNC: (1.3-1.4); FILE MERGED 2008/04/09 13:50:20 sb 1.3.8.2: #i87730# added tools::getProcessWorkingDir; fixed LIB1FILES/LIB1OBJFILES confusion 2008/04/04 12:26:20 sb 1.3.8.1: #i87548# extracted tools/pathutils from desktop extendloaderenvironment, because it is also needed by extensions nsplugin code
-rw-r--r--tools/source/misc/makefile.mk12
1 files changed, 9 insertions, 3 deletions
diff --git a/tools/source/misc/makefile.mk b/tools/source/misc/makefile.mk
index 4a923e66d92c..7742c471445f 100644
--- a/tools/source/misc/makefile.mk
+++ b/tools/source/misc/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.5 $
#
# This file is part of OpenOffice.org.
#
@@ -32,13 +32,19 @@
PRJ = ..$/..
PRJNAME = tools
TARGET = misc
+LIBTARGET = NO
ENABLE_EXCEPTIONS = TRUE
.INCLUDE: settings.mk
.INCLUDE: $(PRJ)$/util$/makefile.pmk
-SLOFILES = \
+LIB1TARGET = $(SLB)$/$(TARGET).lib
+LIB1OBJFILES = \
$(SLO)$/appendunixshellword.obj \
- $(SLO)$/extendapplicationenvironment.obj
+ $(SLO)$/extendapplicationenvironment.obj \
+ $(SLO)$/getprocessworkingdir.obj
+
+OBJFILES = $(OBJ)$/pathutils.obj
+SLOFILES = $(SLO)$/pathutils.obj $(LIB1OBJFILES)
.INCLUDE: target.mk