diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-08-30 09:05:29 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-08-30 09:05:29 +0000 |
| commit | be454d346d9c311c8048088bfdf233b4cc7f9d51 (patch) | |
| tree | ff7098e2b3032bbe2264e87bec2371208c193feb /sc/util | |
| parent | 6f66a893bb66faf74dfe95d044a28ed2363ec16c (diff) | |
INTEGRATION: CWS npower7 (1.39.2); FILE MERGED
2007/07/05 13:16:15 npower 1.39.2.2: RESYNC: (1.39-1.41); FILE MERGED
2007/05/03 09:00:47 npower 1.39.2.1: #i76886# really define LIBCOMPNAME
Diffstat (limited to 'sc/util')
| -rw-r--r-- | sc/util/makefile.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index 6b0644bf8a41..2e9f6a2bf345 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.41 $ +# $Revision: 1.42 $ # -# last change: $Author: vg $ $Date: 2007-05-22 20:15:40 $ +# last change: $Author: vg $ $Date: 2007-08-30 10:05:29 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -266,6 +266,7 @@ DEF9NAME=$(SHL9TARGET) SHL9STDLIBS= \ $(CPPUHELPERLIB) \ + $(VCLLIB) \ $(CPPULIB) \ $(COMPHELPERLIB) \ $(SVLIB) \ @@ -282,6 +283,12 @@ SHL9STDLIBS= \ SHL9DEPN=$(SHL1TARGETN) $(SHL8TARGETN) SHL9LIBS=$(SLB)$/$(TARGET_VBA).lib +.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" + LIBCOMPNAME=$(LOCAL_COMMON_OUT)$/lib/lib$(SHL9TARGET)$(DLLPOST) +.ELSE + LIBCOMPNAME=$(COMMONBIN)$/$(SHL9TARGET)$(DLLPOST) +.ENDIF + .ENDIF |