[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - rsc/source xmlhelp/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Sep 9 14:09:23 UTC 2018
rsc/source/misc/makefile.mk | 41 ----------------
rsc/source/parser/makefile.mk | 63 -------------------------
rsc/source/prj/makefile.mk | 75 ------------------------------
rsc/source/res/makefile.mk | 57 -----------------------
rsc/source/rsc/makefile.mk | 37 ---------------
rsc/source/rscpp/makefile.mk | 88 ------------------------------------
rsc/source/tools/makefile.mk | 41 ----------------
xmlhelp/source/treeview/makefile.mk | 73 -----------------------------
8 files changed, 475 deletions(-)
New commits:
commit a9ac253db17a46829d53f2d60375f5c223288554
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sun Sep 9 13:28:13 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Sun Sep 9 13:28:13 2018 +0000
Delete unused dmake makefile.
Patch by: me
diff --git a/xmlhelp/source/treeview/makefile.mk b/xmlhelp/source/treeview/makefile.mk
deleted file mode 100644
index 3e086d6d442e..000000000000
--- a/xmlhelp/source/treeview/makefile.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#**************************************************************
-#
-# 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
-# regarding copyright ownership. The ASF licenses this file
-# 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=xmlhelp
-TARGET=tvhlp
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-NO_BSYMBOLIC=TRUE
-
-# Version
-TVHLP_MAJOR=1
-
-.INCLUDE: settings.mk
-
-.IF "$(SYSTEM_EXPAT)" == "YES"
-CFLAGS+=-DSYSTEM_EXPAT
-.ENDIF
-
-SLOFILES=\
- $(SLO)$/tvfactory.obj \
- $(SLO)$/tvread.obj
-
-LIB1TARGET=$(SLB)$/_$(TARGET).lib
-LIB1OBJFILES=$(SLOFILES)
-
-SHL1TARGET=$(TARGET)$(TVHLP_MAJOR)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=$(LIB1TARGET)
-SHL1IMPLIB=i$(TARGET)
-SHL1STDLIBS=\
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(COMPHELPERLIB) \
- $(EXPATASCII3RDLIB) \
- $(SALLIB)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=$(SHL1TARGET)
-DEF1DES=UCB : Treeview help
-
-
-.INCLUDE: target.mk
-
-
-
-ALLTAR : $(MISC)/tvhlp1.component
-
-$(MISC)/tvhlp1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- tvhlp1.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt tvhlp1.component
commit 0b78f11b6ea44cfa7586a255282ece110568856d
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sun Sep 9 13:26:31 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Sun Sep 9 13:26:31 2018 +0000
Delete unused dmake makefiles.
Patch by: me
diff --git a/rsc/source/misc/makefile.mk b/rsc/source/misc/makefile.mk
deleted file mode 100644
index bdbc658b3873..000000000000
--- a/rsc/source/misc/makefile.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-#**************************************************************
-#
-# 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
-# regarding copyright ownership. The ASF licenses this file
-# 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=rsc
-TARGET=rscmis
-
-# --- Settings ------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files ---------------------------------------------------------
-
-CXXFILES= rsclst.cxx \
- rscdbl.cxx
-
-OBJFILES= $(OBJ)$/rsclst.obj \
- $(OBJ)$/rscdbl.obj
-
-.INCLUDE : target.mk
diff --git a/rsc/source/parser/makefile.mk b/rsc/source/parser/makefile.mk
deleted file mode 100644
index 36846d9ed2a7..000000000000
--- a/rsc/source/parser/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#**************************************************************
-#
-# 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
-# regarding copyright ownership. The ASF licenses this file
-# 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=..$/..
-
-PROJECTPCH=parser
-PROJECTPCHSOURCE=parser
-PRJNAME=rsc
-TARGET=rscpar
-
-# --- Settings -----------------------------------------------------
-
-#prjpch=T
-
-ENABLE_EXCEPTIONS=true
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-YACCTARGET= $(INCCOM)$/yyrscyacc.cxx
-YACCFILES= rscyacc.y
-
-OBJFILES= $(OBJ)$/rscpar.obj \
- $(OBJ)$/rscyacc.obj \
- $(OBJ)$/rsclex.obj \
- $(OBJ)$/erscerr.obj \
- $(OBJ)$/rsckey.obj \
- $(OBJ)$/rscinit.obj \
- $(OBJ)$/rscibas.obj \
- $(OBJ)$/rscdb.obj \
- $(OBJ)$/rscicpx.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-$(OBJ)$/rscibas.obj : $(YACCTARGET)
-$(OBJ)$/rscinit.obj : $(YACCTARGET)
-$(OBJ)$/rscicpx.obj : $(YACCTARGET)
-$(OBJ)$/rsclex.obj : $(YACCTARGET)
-$(OBJ)$/rscyacc.obj : $(YACCTARGET)
-
diff --git a/rsc/source/prj/makefile.mk b/rsc/source/prj/makefile.mk
deleted file mode 100644
index f5fcacc4e596..000000000000
--- a/rsc/source/prj/makefile.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#**************************************************************
-#
-# 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
-# regarding copyright ownership. The ASF licenses this file
-# 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=rsc
-TARGETTYPE=CUI
-TARGET=rsc
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------------
-
-OBJFILES= $(OBJ)$/gui.obj \
- $(OBJ)$/start.obj
-
-APP1TARGET= rsc
-APP1STDLIBS=$(TOOLSLIB) $(I18NISOLANGLIB) $(VOSLIB) $(SALLIB) # $(RTLLIB)
-APP1LIBS= $(LB)$/rsctoo.lib
-APP1OBJS= $(OBJ)$/start.obj
-.IF "$(GUI)" != "OS2"
-# why not this way?
-APP1STACK=64000
-#APP1STACK=32768
-.ENDIF
-APP1RPATH=NONE
-
-APP2TARGET= rsc2
-.IF "$(OS)"=="SCO"
-# SCO hat Probleme mit fork/exec und einigen shared libraries.
-# rsc2 muss daher statisch gelinkt werden
-APP2STDLIBS=$(STATIC) -latools $(BPICONVLIB) $(VOSLIB) $(OSLLIB) $(RTLLIB) $(DYNAMIC)
-.ELSE
-APP2STDLIBS=$(TOOLSLIB) $(I18NISOLANGLIB) $(VOSLIB) $(SALLIB) # $(RTLLIB)
-.ENDIF
-APP2LIBS= $(LB)$/rsctoo.lib \
- $(LB)$/rscres.lib \
- $(LB)$/rscpar.lib \
- $(LB)$/rscrsc.lib \
- $(LB)$/rscmis.lib
-APP2OBJS= $(OBJ)$/gui.obj
-.IF "$(GUI)" != "OS2"
-# why not this way?
-APP2STACK=64000
-#APP2STACK=32768
-.ENDIF
-APP2RPATH=NONE
-
-# --- Targets ------------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/rsc/source/res/makefile.mk b/rsc/source/res/makefile.mk
deleted file mode 100644
index 46a08336b99b..000000000000
--- a/rsc/source/res/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#**************************************************************
-#
-# 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
-# regarding copyright ownership. The ASF licenses this file
-# 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=rsc
-TARGET=rscres
-
-# --- Settings ------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-OBJFILES= $(OBJ)$/rscclobj.obj \
- $(OBJ)$/rsccont.obj \
- $(OBJ)$/rsctop.obj \
- $(OBJ)$/rscrange.obj \
- $(OBJ)$/rscconst.obj \
- $(OBJ)$/rscflag.obj \
- $(OBJ)$/rscstr.obj \
- $(OBJ)$/rscall.obj \
- $(OBJ)$/rscmgr.obj \
- $(OBJ)$/rscclass.obj \
- $(OBJ)$/rscarray.obj
-
-CXXFILES= rscclobj.cxx \
- rsctop.cxx \
- rscrange.cxx \
- rscconst.cxx \
- rscflag.cxx \
- rscstr.cxx \
- rscall.cxx \
- rsccont.cxx \
- rscclass.cxx \
- rscmgr.cxx \
- rscarray.cxx
-
-.INCLUDE : target.mk
diff --git a/rsc/source/rsc/makefile.mk b/rsc/source/rsc/makefile.mk
deleted file mode 100644
index 27f7bea4e0d7..000000000000
--- a/rsc/source/rsc/makefile.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#**************************************************************
-#
-# 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
-# regarding copyright ownership. The ASF licenses this file
-# 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=rsc
-TARGET=rscrsc
-
-# --- Settings -------------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-
-.INCLUDE : settings.mk
-
-OBJFILES= $(OBJ)$/rsc.obj
-
-.INCLUDE : target.mk
diff --git a/rsc/source/rscpp/makefile.mk b/rsc/source/rscpp/makefile.mk
deleted file mode 100644
index 82979fa48d36..000000000000
--- a/rsc/source/rscpp/makefile.mk
+++ /dev/null
@@ -1,88 +0,0 @@
-#**************************************************************
-#
-# 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
-# regarding copyright ownership. The ASF licenses this file
-# 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=..$/..
-
-TARGETTYPE=CUI
-NO_DEFAULT_STL=TRUE
-
-PRJNAME=rsc
-TARGET=rscpp
-
-.IF "$(cpp)" != ""
-PRJNAME=CPP
-TARGET=cpp
-.ENDIF
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-CDEFS+=-DSOLAR
-
-.IF "$(cpp)" != ""
-CDEFS+=-DNOMAIN
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
- $(OBJ)$/cpp1.obj \
- $(OBJ)$/cpp2.obj \
- $(OBJ)$/cpp3.obj \
- $(OBJ)$/cpp4.obj \
- $(OBJ)$/cpp5.obj \
- $(OBJ)$/cpp6.obj \
-
-.IF "$(cpp)" == ""
-LIBSALCPPRT=$(0)
-APP1TARGET= $(TARGET)
-APP1LIBS=$(LB)$/$(TARGET).lib
-.IF "$(GUI)" != "OS2"
-APP1STACK=32768
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)"=="UNX"
-CDEFS+=-Dunix
-.ENDIF
-
-.IF "$(OS)$(CPU)"=="SOLARISI"
-# cc: Sun C 5.5 Patch 112761-10 2004/08/10
-# Solaris x86 compiler ICE
-# "cpp6.c", [get]:ube: internal error
-# remove after compiler upgrade
-NOOPTFILES=$(OBJ)$/cpp6.obj
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-cpp1.c: cppdef.h cpp.h
-cpp2.c: cppdef.h cpp.h
-cpp3.c: cppdef.h cpp.h
-cpp4.c: cppdef.h cpp.h
-cpp5.c: cppdef.h cpp.h
-cpp6.c: cppdef.h cpp.h
-
-
diff --git a/rsc/source/tools/makefile.mk b/rsc/source/tools/makefile.mk
deleted file mode 100644
index 9e3b839c755d..000000000000
--- a/rsc/source/tools/makefile.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-#**************************************************************
-#
-# 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
-# regarding copyright ownership. The ASF licenses this file
-# 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=rsc
-TARGET=rsctoo
-
-# --- Settings ------------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-
-.INCLUDE : settings.mk
-
-OBJFILES= $(OBJ)$/rschash.obj \
- $(OBJ)$/rsctree.obj \
- $(OBJ)$/rsctools.obj \
- $(OBJ)$/rscchar.obj \
- $(OBJ)$/rscdef.obj
-
-.INCLUDE : target.mk
More information about the Libreoffice-commits
mailing list