This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO41X by this push:
new 2fa1c4e3f5 The directory names depend on the OS_TARGET. Better not use
hardcoded names here.
2fa1c4e3f5 is described below
commit 2fa1c4e3f500628e0177d457cc6171d322f2aee5
Author: mseidel <msei...@apache.org>
AuthorDate: Sun Jan 21 21:44:17 2024 +0100
The directory names depend on the OS_TARGET. Better not use hardcoded names
here.
(cherry picked from commit be73badc2e5d8dff3510ab391842e03eee671edb)
---
main/nss/makefile.mk | 50 +++++++++++++++++++++++++-------------------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/main/nss/makefile.mk b/main/nss/makefile.mk
index 6d64d53e9e..9c3705d72a 100644
--- a/main/nss/makefile.mk
+++ b/main/nss/makefile.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,20 +7,18 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
-
-
PRJ=.
PRJNAME=nss
@@ -67,7 +65,7 @@ OUT2LIB=dist$/*.OBJ$/lib$/*$(DLLPOST)
BUILD_DIR=nss
BUILD_ACTION= $(GNUMAKE) nss_build_all
-#See #i105566# && moz#513024#
+# See #i105566# && moz#513024#
.IF "$(OS)"=="LINUX"
BUILD_ACTION+=FREEBL_NO_DEPEND=1 FREEBL_LOWHASH=1 NSS_DISABLE_GTESTS=1
PATCH_FILES+=nss_linux.patch
@@ -115,15 +113,15 @@ OUT2LIB= \
dist$/*.OBJ$/lib$/libsqlite3.a \
dist$/*.OBJ$/lib$/libssl3.a
-.ELSE # "$(COM)"=="GCC"
+.ELSE # "$(COM)"=="GCC"
MOZ_MSVCVERSION= 9
.EXPORT : MOZ_MSVCVERSION
PATCH_FILES+=nss_win.patch
moz_build:=$(shell cygpath -p $(MOZILLABUILD))
-#Using WINNT will cause at least that nspr4.dll, plc4.dll, plds4.dll
-#become libnspr4.dll, libplc4.dll, libplds4.dll
-#WINNT causes the use of Microsoft fibers (specific to Windows NT and Windows
2000).
+# Using WINNT will cause at least that nspr4.dll, plc4.dll, plds4.dll
+# become libnspr4.dll, libplc4.dll, libplds4.dll
+# WINNT causes the use of Microsoft fibers (specific to Windows NT and Windows
2000).
#OS_TARGET= WINNT
OS_TARGET=WIN95
.EXPORT : OS_TARGET
@@ -137,29 +135,31 @@ BUILD_ACTION=
PATH="$(PATH):$(moz_build)/msys/bin:$(moz_build)/bin:$(moz_build)/
-c "cd $(NSS_BUILD_DIR) && make nss_build_all NSS_DISABLE_GTESTS=1"
OUT2LIB= \
- dist$/WIN954.0_OPT.OBJ$/lib$/nspr4.lib \
- dist$/WIN954.0_OPT.OBJ$/lib$/nss3.lib \
- dist$/WIN954.0_OPT.OBJ$/lib$/nssdbm3.lib \
- dist$/WIN954.0_OPT.OBJ$/lib$/nssutil3.lib \
- dist$/WIN954.0_OPT.OBJ$/lib$/plc4.lib \
- dist$/WIN954.0_OPT.OBJ$/lib$/plds4.lib \
- dist$/WIN954.0_OPT.OBJ$/lib$/smime3.lib \
- dist$/WIN954.0_OPT.OBJ$/lib$/softokn3.lib \
- dist$/WIN954.0_OPT.OBJ$/lib$/sqlite3.lib \
- dist$/WIN954.0_OPT.OBJ$/lib$/ssl3.lib
+ dist$/*.OBJ$/lib$/nspr4.lib \
+ dist$/*.OBJ$/lib$/nss3.lib \
+ dist$/*.OBJ$/lib$/nssdbm3.lib \
+ dist$/*.OBJ$/lib$/nssutil3.lib \
+ dist$/*.OBJ$/lib$/plc4.lib \
+ dist$/*.OBJ$/lib$/plds4.lib \
+ dist$/*.OBJ$/lib$/smime3.lib \
+ dist$/*.OBJ$/lib$/softokn3.lib \
+ dist$/*.OBJ$/lib$/sqlite3.lib \
+ dist$/*.OBJ$/lib$/ssl3.lib
-.ENDIF # "$(COM)"=="GCC"
+.ENDIF # "$(COM)"=="GCC"
-OUT2BIN=dist$/WIN954.0_OPT.OBJ$/lib$/*$(DLLPOST)
-.ENDIF # "$(GUI)"=="WNT"
+OUT2BIN=dist$/*.OBJ$/lib$/*$(DLLPOST)
+.ENDIF # "$(GUI)"=="WNT"
OUTDIR2INC=dist$/public$/nss dist$/*.OBJ$/include
# --- Targets ------------------------------------------------------
-.INCLUDE : set_ext.mk
+.INCLUDE : set_ext.mk
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
.ENDIF
+
+# vim: set noet sw=4 ts=4:
