This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 7d506f6 Small cleanup in OS/2 makefiles
7d506f6 is described below
commit 7d506f6c77d4a98ba2da1753c239e827d0e0b491
Author: mseidel <[email protected]>
AuthorDate: Tue Jun 15 19:42:33 2021 +0200
Small cleanup in OS/2 makefiles
(cherry picked from commit 6bb8e1673862694f75aaac04ec1da8ae4993f9b0)
---
main/solenv/inc/os2.mk | 22 +++++++++++-----------
main/solenv/inc/os2gcci.mk | 30 +++++++++++++++---------------
2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/main/solenv/inc/os2.mk b/main/solenv/inc/os2.mk
index 3a4514d..c4005f7 100644
--- a/main/solenv/inc/os2.mk
+++ b/main/solenv/inc/os2.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,21 +7,21 @@
# 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.
-#
+#
#**************************************************************
-# --- OS2-Environment ----------------------------------------------
+# --- OS/2-Environment ---
.IF "$(GUI)" == "OS2"
@@ -115,7 +115,7 @@ AFLAGS=/ml /oi
CXX=icc
CC=icc
.IF "$(COMEX)"=="3"
-CFLAGS=/C+ /Q+ /Gf+ /Sp1 /G4 /Se /Gs+ /Gt+ /Gd+ /J- /W2 /D__EXTENDED__ /Si+
/Xi+ $(MINUS_I)$(INCLUDE) /Wvft-
+CFLAGS=/C+ /Q+ /Gf+ /Sp1 /G4 /Se /Gs+ /Gt+ /Gd+ /J- /W2 /D__EXTENDED__ /Si+
/Xi+ $(MINUS_I)$(INCLUDE) /Wvft-
.ELSE
.IF "$(COMEX)"=="I"
CFLAGS=/C+ /Tl10 /Q+ /Gf+ /Sp4 /G4 /Sc /Gs- /D__EXTENDED__ /Si+ /Su4
@@ -124,7 +124,7 @@ CFLAGS=/C+ /Tl10 /Q+ /Gf+ /Sp1 /G4 /Sc /Gs+ /D__EXTENDED__
/Si+
.ENDIF
.ENDIF
-CFLAGSCXX=/Tdp
+CFLAGSCXX=/Tdp
CFLAGSEXCEPTIONS=-Gx-
CFLAGS_NO_EXCEPTIONS=-Gx+
@@ -132,7 +132,7 @@ CFLAGS_NO_EXCEPTIONS=-Gx+
CFLAGSOBJGUIST=/Ge+
CFLAGSOBJCUIST=/Ge+
.IF "$(COMEX)"=="I"
-CFLAGSOBJGUIMT=/Ge+ /Gm+
+CFLAGSOBJGUIMT=/Ge+ /Gm+
CFLAGSOBJCUIMT=/Ge+ /Gm+
CFLAGSSLOGUIMT=/Ge- /Gm+
CFLAGSSLOCUIMT=/Ge- /Gm+
@@ -154,7 +154,7 @@ CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE
-D_UNO_NO_NAMESPACE
LINK=ilink
#LINKFLAGS=/PACKCODE:8192 /ALIGN:16 /NOD /NOE /NOI /MAP /NOFREE
-#bei too many segments ist /SEGMENTS:nnnn hilfreich. 3072 ist max!
+# In case of too many segments /SEGMENTS:nnnn is helpful. 3072 is max!
.IF "$(CPPRTST)"!=""
LINKFLAGS=/NOFREE /NOD /NOE /NOI /MAP /OPTFUNC /PACKD:65536 /EXEPACK:2
.ELSE
@@ -250,7 +250,7 @@ AFLAGS=/ml /4pr
CC=wcl386
CXX=wcl386
.IF "$(e2p)" != ""
-CFLAGS=-c -W3 -Zp4 -Zld $(MINUS_I)$(INCLUDE) -bt=os2 -zq -zm -ep -ee
+CFLAGS=-c -W3 -Zp4 -Zld $(MINUS_I)$(INCLUDE) -bt=os2 -zq -zm -ep -ee
.ELSE
CFLAGS=-c -Zp4 -W3 -Zl -Zld $(MINUS_I)$(INCLUDE) -bt=os2 -zq -s
.ENDIF
@@ -315,7 +315,7 @@ DLLPOSTFIX=wo
.ENDIF
-# --- OS2 Allgemein ---
+# --- OS/2-General ---
HC=toipf
HCFLAGS=
PATH_SEPERATOR*=;
diff --git a/main/solenv/inc/os2gcci.mk b/main/solenv/inc/os2gcci.mk
index b27b863..fa3873a 100644
--- a/main/solenv/inc/os2gcci.mk
+++ b/main/solenv/inc/os2gcci.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,23 +7,23 @@
# 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.
-#
+#
#**************************************************************
-# --- OS2-Environment ----------------------------------------------
+# --- OS/2-Environment ---
-#change output dir name using the object binary format.
+# change output dir name using the object binary format.
#.IF "$(aout)"==""
#OUTFMT=omf
#.ELSE
@@ -45,7 +45,7 @@ EMXOMFOPT = -q
JAVAFLAGSDEBUG=-g
# filter for suppressing verbose messages from linker
-#not needed at the moment
+# not needed at the moment
#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
.IF "$(ttt)"!=""
@@ -88,7 +88,7 @@ CFLAGSEXCEPTIONS=-fexceptions
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
CFLAGSCXX= -frtti $(ARCH_FLAGS)
-CFLAGSCXX+= -Wno-ctor-dtor-privacy -fmessage-length=0
+CFLAGSCXX+= -Wno-ctor-dtor-privacy -fmessage-length=0
PICSWITCH:=
# Compiler flags for compiling static object in single threaded environment
with graphical user interface
@@ -108,11 +108,11 @@ CFLAGSPROF=
# Compiler flags for debugging
CFLAGSDEBUG=-g
CFLAGSDBGUTIL=
-# Compiler flags for enabling optimazations
+# Compiler flags for enabling optimizations
CFLAGSOPT=-s -O1 -march=pentium -mtune=pentium4
-# Compiler flags for disabling optimazations
+# Compiler flags for disabling optimizations
CFLAGSNOOPT=-O0
-# Compiler flags for discibing the output path
+# Compiler flags for describing the output path
CFLAGSOUTOBJ=-o
# Warnings switched off for CXX:
@@ -167,8 +167,8 @@ MODULES_WITH_WARNINGS := \
# switches for dynamic and static linking
-STATIC =
-DYNAMIC =
+STATIC =
+DYNAMIC =
# this is needed to allow stl headers to include os2.h instead of svpm.h
# in earlier stages of project build. Once svpm.h is in place, we can
@@ -184,7 +184,7 @@ CFLAGSCXX+=$(LIBXML_CFLAGS) -I$(JAVA_HOME)/include
-I$(JAVA_HOME)/include/os2
# name of linker
LINK*=gcc
# default linker flags
-LINKFLAGS= -Zbin-files -Zmap
+LINKFLAGS= -Zbin-files -Zmap
#27/01/06 bin-files confuses transex/rsc work, removed.
LINKFLAGS= -Zno-fork -Zhigh-mem -Zmap
LINKFLAGS+=-lcx
@@ -259,7 +259,7 @@ STDLIBGUIST=$(STDLIBCPP)
STDSHLGUIMT=$(STDLIBCPP)
STDSHLCUIMT=$(STDLIBCPP)
-LIBSTLPORT=$(DYNAMIC)
+LIBSTLPORT=$(DYNAMIC)
LIBSTLPORTST=$(STATIC) $(DYNAMIC)
