[Libreoffice-commits] core.git: autodoc/source helpcontent2 writerfilter/qa
Caolán McNamara
caolanm at redhat.com
Mon Feb 25 02:54:15 PST 2013
autodoc/source/ary/doc/makefile.mk | 47 ------------
autodoc/source/ary/idl/makefile.mk | 78 --------------------
autodoc/source/ary/info/makefile.mk | 51 -------------
autodoc/source/ary/kernel/makefile.mk | 51 -------------
autodoc/source/ary_i/kernel/makefile.mk | 51 -------------
autodoc/source/display/html/makefile.mk | 45 -----------
autodoc/source/display/idl/makefile.mk | 68 -----------------
autodoc/source/display/kernel/makefile.mk | 46 -----------
autodoc/source/display/toolkit/makefile.mk | 55 --------------
autodoc/source/exes/adc_uni/makefile.mk | 93 ------------------------
autodoc/source/parser/kernel/makefile.mk | 49 ------------
autodoc/source/parser/tokens/makefile.mk | 50 ------------
autodoc/source/parser_i/idl/makefile.mk | 75 -------------------
autodoc/source/parser_i/idoc/makefile.mk | 53 -------------
autodoc/source/parser_i/tokens/makefile.mk | 54 -------------
autodoc/source/tools/makefile.mk | 49 ------------
helpcontent2 | 2
writerfilter/qa/cppunittests/doctok/makefile.mk | 61 ---------------
writerfilter/qa/cppunittests/odiapi/makefile.mk | 56 --------------
writerfilter/qa/cppunittests/qname/makefile.mk | 67 -----------------
20 files changed, 1 insertion(+), 1100 deletions(-)
New commits:
commit 23a133dfe7f7549fbaeeeefef81f736d9a3bc0c2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 25 10:53:15 2013 +0000
drop various dangling makefile.mks
Change-Id: Id76b57a1ef2edbb05f1d22a624caad077275ac74
diff --git a/autodoc/source/ary/doc/makefile.mk b/autodoc/source/ary/doc/makefile.mk
deleted file mode 100644
index e7beb57..0000000
--- a/autodoc/source/ary/doc/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-
-PRJ=..$/..$/..
-
-PRJNAME=autodoc
-TARGET=ary_doc
-
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-PRJINC=$(PRJ)$/source
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
-
-
-
-# --- Files --------------------------------------------------------
-
-
-OBJFILES= \
- $(OBJ)$/d_docu.obj \
- $(OBJ)$/d_node.obj \
- $(OBJ)$/d_oldidldocu.obj
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/autodoc/source/ary/idl/makefile.mk b/autodoc/source/ary/idl/makefile.mk
deleted file mode 100644
index 1691a2b..0000000
--- a/autodoc/source/ary/idl/makefile.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-
-PRJ=..$/..$/..
-
-PRJNAME=autodoc
-TARGET=ary_idl
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-PRJINC=$(PRJ)$/source
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
-
-
-# --- Files --------------------------------------------------------
-
-
-OBJFILES= \
- $(OBJ)$/i_attribute.obj \
- $(OBJ)$/i_ce.obj \
- $(OBJ)$/i_ce2s.obj \
- $(OBJ)$/i_comrela.obj \
- $(OBJ)$/i_constant.obj \
- $(OBJ)$/i_constgroup.obj \
- $(OBJ)$/i_enum.obj \
- $(OBJ)$/i_enumvalue.obj \
- $(OBJ)$/i_exception.obj \
- $(OBJ)$/i_function.obj \
- $(OBJ)$/i_interface.obj \
- $(OBJ)$/i_module.obj \
- $(OBJ)$/i_namelookup.obj \
- $(OBJ)$/i_param.obj \
- $(OBJ)$/i_property.obj \
- $(OBJ)$/i_reposypart.obj \
- $(OBJ)$/i_service.obj \
- $(OBJ)$/i_singleton.obj \
- $(OBJ)$/i_siservice.obj \
- $(OBJ)$/i_sisingleton.obj \
- $(OBJ)$/i_struct.obj \
- $(OBJ)$/i_structelem.obj \
- $(OBJ)$/i_traits.obj \
- $(OBJ)$/i_typedef.obj \
- $(OBJ)$/i2s_calculator.obj \
- $(OBJ)$/ia_ce.obj \
- $(OBJ)$/ia_type.obj \
- $(OBJ)$/is_ce.obj \
- $(OBJ)$/is_type.obj \
- $(OBJ)$/it_builtin.obj \
- $(OBJ)$/it_ce.obj \
- $(OBJ)$/it_explicit.obj \
- $(OBJ)$/it_sequence.obj \
- $(OBJ)$/it_tplparam.obj \
- $(OBJ)$/it_xnameroom.obj
-
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/autodoc/source/ary/info/makefile.mk b/autodoc/source/ary/info/makefile.mk
deleted file mode 100644
index cb729a4..0000000
--- a/autodoc/source/ary/info/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-
-PRJ=..$/..$/..
-
-PRJNAME=autodoc
-TARGET=ary_info
-
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-PRJINC=$(PRJ)$/source
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
-
-
-
-# --- Files --------------------------------------------------------
-
-
-OBJFILES= \
- $(OBJ)$/all_dts.obj \
- $(OBJ)$/all_tags.obj \
- $(OBJ)$/ci_attag.obj \
- $(OBJ)$/ci_text.obj
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-
diff --git a/autodoc/source/ary/kernel/makefile.mk b/autodoc/source/ary/kernel/makefile.mk
deleted file mode 100644
index 3f63c1e..0000000
--- a/autodoc/source/ary/kernel/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-
-PRJ=..$/..$/..
-
-PRJNAME=autodoc
-TARGET=ary_kernel
-
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-PRJINC=$(PRJ)$/source
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
-
-
-
-# --- Files --------------------------------------------------------
-
-
-OBJFILES= \
- $(OBJ)$/namesort.obj \
- $(OBJ)$/qualiname.obj \
- $(OBJ)$/reposy.obj \
-
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-
diff --git a/autodoc/source/ary_i/kernel/makefile.mk b/autodoc/source/ary_i/kernel/makefile.mk
deleted file mode 100644
index 666697b..0000000
--- a/autodoc/source/ary_i/kernel/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-
-PRJ=..$/..$/..
-
-PRJNAME=autodoc
-TARGET=ary2_cinfo
-
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-PRJINC=$(PRJ)$/source
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
-
-
-
-# --- Files --------------------------------------------------------
-
-
-OBJFILES= \
- $(OBJ)$/ci_atag2.obj \
- $(OBJ)$/ci_text2.obj \
- $(OBJ)$/d_token.obj
-
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-
diff --git a/autodoc/source/display/html/makefile.mk b/autodoc/source/display/html/makefile.mk
deleted file mode 100644
index 9ef43d0..0000000
--- a/autodoc/source/display/html/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-
-PRJ=..$/..$/..
-
-PRJNAME=autodoc
-TARGET=display_html
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-PRJINC=$(PRJ)$/source
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
- $(OBJ)$/cfrstd.obj \
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-
diff --git a/autodoc/source/display/idl/makefile.mk b/autodoc/source/display/idl/makefile.mk
deleted file mode 100644
index e13729a..0000000
--- a/autodoc/source/display/idl/makefile.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-
-PRJ=..$/..$/..
-
-PRJNAME=autodoc
-TARGET=display_idl
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-PRJINC=$(PRJ)$/source
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
- $(OBJ)$/hfi_constgroup.obj \
- $(OBJ)$/hfi_doc.obj \
- $(OBJ)$/hfi_enum.obj \
- $(OBJ)$/hfi_globalindex.obj \
- $(OBJ)$/hfi_hierarchy.obj \
- $(OBJ)$/hfi_interface.obj \
- $(OBJ)$/hfi_method.obj \
- $(OBJ)$/hfi_module.obj \
- $(OBJ)$/hfi_navibar.obj \
- $(OBJ)$/hfi_property.obj \
- $(OBJ)$/hfi_service.obj \
- $(OBJ)$/hfi_singleton.obj \
- $(OBJ)$/hfi_siservice.obj \
- $(OBJ)$/hfi_struct.obj \
- $(OBJ)$/hfi_tag.obj \
- $(OBJ)$/hfi_typedef.obj \
- $(OBJ)$/hfi_typetext.obj \
- $(OBJ)$/hfi_xrefpage.obj \
- $(OBJ)$/hi_ary.obj \
- $(OBJ)$/hi_display.obj \
- $(OBJ)$/hi_env.obj \
- $(OBJ)$/hi_factory.obj \
- $(OBJ)$/hi_linkhelper.obj \
- $(OBJ)$/hi_main.obj
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-
diff --git a/autodoc/source/display/kernel/makefile.mk b/autodoc/source/display/kernel/makefile.mk
deleted file mode 100644
index e9e0c1a..0000000
--- a/autodoc/source/display/kernel/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-
-PRJ=..$/..$/..
-
-PRJNAME=autodoc
-TARGET=display_kernel
-TARGETTYPE=CUI
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-PRJINC=$(PRJ)$/source
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
- $(OBJ)$/displfct.obj
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-
diff --git a/autodoc/source/display/toolkit/makefile.mk b/autodoc/source/display/toolkit/makefile.mk
deleted file mode 100644
index d98aaad..0000000
--- a/autodoc/source/display/toolkit/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-
-PRJ=..$/..$/..
-
-PRJNAME=autodoc
-TARGET=display_toolkit
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-PRJINC=$(PRJ)$/source
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
- $(OBJ)$/hf_docentry.obj \
- $(OBJ)$/hf_funcdecl.obj \
- $(OBJ)$/hf_linachain.obj \
- $(OBJ)$/hf_navi_main.obj \
- $(OBJ)$/hf_navi_sub.obj \
- $(OBJ)$/hf_title.obj \
- $(OBJ)$/htmlfile.obj \
- $(OBJ)$/out_node.obj \
- $(OBJ)$/out_position.obj \
- $(OBJ)$/out_tree.obj \
- $(OBJ)$/outputstack.obj
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-
diff --git a/autodoc/source/exes/adc_uni/makefile.mk b/autodoc/source/exes/adc_uni/makefile.mk
deleted file mode 100644
index 2cb3980..0000000
--- a/autodoc/source/exes/adc_uni/makefile.mk
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-
-PRJ=..$/..$/..
-
-PRJNAME=autodoc
-TARGET=autodoc
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-PRJINC=$(PRJ)$/source
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
-
-UWINAPILIB=$(0)
-LIBSALCPPRT=$(0)
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
- $(OBJ)$/adc_cl.obj \
- $(OBJ)$/adc_cmd_parse.obj \
- $(OBJ)$/adc_cmds.obj \
- $(OBJ)$/adc_msg.obj \
- $(OBJ)$/cmd_run.obj \
- $(OBJ)$/cmd_sincedata.obj
-
-
-# --- Targets ------------------------------------------------------
-
-LIB1TARGET=$(LB)$/atdoc.lib
-LIB1FILES= \
- $(LB)$/$(TARGET).lib $(LB)$/autodoc_tools.lib \
- $(LB)$/ary_kernel.lib $(LB)$/ary_idl.lib \
- $(LB)$/ary_info.lib \
- $(LB)$/parser_kernel.lib $(LB)$/parser_tokens.lib \
- $(LB)$/display_kernel.lib $(LB)$/display_html.lib $(LB)$/display_idl.lib \
- $(LB)$/display_toolkit.lib $(LB)$/parser2_tokens.lib \
- $(LB)$/parser2_s2_luidl.lib $(LB)$/parser2_s2_dsapi.lib \
- $(LB)$/ary2_cinfo.lib $(LB)$/ary_doc.lib
-
-
-
-APP1TARGET= $(TARGET)
-APP1STACK= 1000000
-APP1OBJS= $(OBJ)$/main.obj
-
-APP1RPATH=SDKBIN
-
-.IF "$(OS)"=="WNT"
-APP1STDLIBS= $(COSVLIB) $(UDMLIB)
-.ELSE
-.IF "$(OS)"=="MACOSX"
-# See <http://porting.openoffice.org/servlets/ReadMsg?list=mac&msgNo=6911>:
-APP1STDLIBS= -Wl,-all_load -ludm -lcosv
-.ELSE
-APP1STDLIBS= -lcosv -ludm
-.ENDIF
-.ENDIF
-
-APP1LIBS=$(LB)$/atdoc.lib
-
-DEPOBJFILES += $(APP1OBJS)
-
-APP1DEPN= $(LB)$/$(TARGET).lib $(LB)$/autodoc_tools.lib \
- $(LB)$/ary_kernel.lib $(LB)$/ary_idl.lib \
- $(LB)$/ary_info.lib \
- $(LB)$/parser_kernel.lib $(LB)$/parser_tokens.lib \
- $(LB)$/display_kernel.lib $(LB)$/display_html.lib $(LB)$/display_idl.lib \
- $(LB)$/display_toolkit.lib $(LB)$/parser2_tokens.lib \
- $(LB)$/parser2_s2_luidl.lib $(LB)$/parser2_s2_dsapi.lib \
- $(LB)$/ary2_cinfo.lib $(LB)$/ary_doc.lib
-
-
-.INCLUDE : target.mk
diff --git a/autodoc/source/parser/kernel/makefile.mk b/autodoc/source/parser/kernel/makefile.mk
deleted file mode 100644
index 331e818..0000000
--- a/autodoc/source/parser/kernel/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-
-PRJ=..$/..$/..
-
-PRJNAME=autodoc
-TARGET=parser_kernel
-TARGETTYPE=CUI
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-PRJINC=$(PRJ)$/source
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
-
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
- $(OBJ)$/parsefct.obj \
- $(OBJ)$/x_docu.obj \
- $(OBJ)$/x_parse.obj
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-
diff --git a/autodoc/source/parser/tokens/makefile.mk b/autodoc/source/parser/tokens/makefile.mk
deleted file mode 100644
index 2468771..0000000
--- a/autodoc/source/parser/tokens/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-
-PRJ=..$/..$/..
-
-PRJNAME=garden
-TARGET=parser_tokens
-TARGETTYPE=CUI
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-PRJINC=$(PRJ)$/source
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
-
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
- $(OBJ)$/stmstate.obj \
- $(OBJ)$/tkp.obj \
- $(OBJ)$/tkpcontx.obj \
- $(OBJ)$/tokdeal.obj
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-
diff --git a/autodoc/source/parser_i/idl/makefile.mk b/autodoc/source/parser_i/idl/makefile.mk
deleted file mode 100644
index 84be244..0000000
--- a/autodoc/source/parser_i/idl/makefile.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-
-PRJ=..$/..$/..
-
-PRJNAME=autodoc
-TARGET=parser2_s2_luidl
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-PRJINC=$(PRJ)$/source
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
-
-
-
-# --- Files --------------------------------------------------------
-
-
-OBJFILES= \
- $(OBJ)$/cx_idlco.obj \
- $(OBJ)$/cx_sub.obj \
- $(OBJ)$/distrib.obj \
- $(OBJ)$/parsenv2.obj \
- $(OBJ)$/pe_attri.obj \
- $(OBJ)$/pe_const.obj \
- $(OBJ)$/pe_enum2.obj \
- $(OBJ)$/pe_evalu.obj \
- $(OBJ)$/pe_excp.obj \
- $(OBJ)$/pe_file2.obj \
- $(OBJ)$/pe_func2.obj \
- $(OBJ)$/pe_iface.obj \
- $(OBJ)$/pe_property.obj \
- $(OBJ)$/pe_selem.obj \
- $(OBJ)$/pe_servi.obj \
- $(OBJ)$/pe_singl.obj \
- $(OBJ)$/pe_struc.obj \
- $(OBJ)$/pe_tydf2.obj \
- $(OBJ)$/pe_type2.obj \
- $(OBJ)$/pe_vari2.obj \
- $(OBJ)$/pestate.obj \
- $(OBJ)$/semnode.obj \
- $(OBJ)$/tk_const.obj \
- $(OBJ)$/tk_ident.obj \
- $(OBJ)$/tk_keyw.obj \
- $(OBJ)$/tk_punct.obj \
- $(OBJ)$/tkp_uidl.obj \
- $(OBJ)$/unoidl.obj
-
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-
diff --git a/autodoc/source/parser_i/idoc/makefile.mk b/autodoc/source/parser_i/idoc/makefile.mk
deleted file mode 100644
index 168c58a..0000000
--- a/autodoc/source/parser_i/idoc/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-
-PRJ=..$/..$/..
-
-PRJNAME=autodoc
-TARGET=parser2_s2_dsapi
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-PRJINC=$(PRJ)$/source
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
-
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
- $(OBJ)$/cx_docu2.obj \
- $(OBJ)$/cx_dsapi.obj \
- $(OBJ)$/docu_pe2.obj \
- $(OBJ)$/tk_atag2.obj \
- $(OBJ)$/tk_docw2.obj \
- $(OBJ)$/tk_html.obj \
- $(OBJ)$/tk_xml.obj
-
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-
diff --git a/autodoc/source/parser_i/tokens/makefile.mk b/autodoc/source/parser_i/tokens/makefile.mk
deleted file mode 100644
index cc0cf97..0000000
--- a/autodoc/source/parser_i/tokens/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-
-PRJ=..$/..$/..
-
-PRJNAME=garden
-TARGET=parser2_tokens
-TARGETTYPE=CUI
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-PRJINC=$(PRJ)$/source
-
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
-
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
- $(OBJ)$/stmstar2.obj \
- $(OBJ)$/stmstat2.obj \
- $(OBJ)$/stmstfi2.obj \
- $(OBJ)$/tkpstam2.obj \
- $(OBJ)$/tkp2.obj \
- $(OBJ)$/tkpcont2.obj \
- $(OBJ)$/x_parse2.obj
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-
diff --git a/autodoc/source/tools/makefile.mk b/autodoc/source/tools/makefile.mk
deleted file mode 100644
index 9d611b8..0000000
--- a/autodoc/source/tools/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-
-PRJ=..$/..
-
-PRJNAME=autodoc
-TARGET=autodoc_tools
-TARGETTYPE=CUI
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-PRJINC=$(PRJ)$/source
-
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
-
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
- $(OBJ)$/filecoll.obj \
- $(OBJ)$/tkpchars.obj
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-
diff --git a/helpcontent2 b/helpcontent2
index c722cd7..6e3f40c 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c722cd78bfcc47e6c99d16af0db9dee68c96a654
+Subproject commit 6e3f40c9ca05ba234fac04074f594530f2e89e75
diff --git a/writerfilter/qa/cppunittests/doctok/makefile.mk b/writerfilter/qa/cppunittests/doctok/makefile.mk
deleted file mode 100644
index 1a79164..0000000
--- a/writerfilter/qa/cppunittests/doctok/makefile.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-PRJ=..$/..$/..
-
-PRJNAME=writerfilter
-TARGET=test-doctok
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:doctok by codegen.pl
-SHL1OBJS= \
- $(SLO)$/testdoctok.obj
-
-SHL1TARGET= testdoctok
-SHL1STDLIBS=\
- $(SALLIB) \
- $(UCBHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(CPPUNITLIB)
-
-SHL1LIBS=\
- $(SLB)$/doctok.lib
-SHL1DEPS= \
- $(SHL1LIBS)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME =$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP= export.map
-# auto generated Target:doctok
-# END ------------------------------------------------------------------
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
diff --git a/writerfilter/qa/cppunittests/odiapi/makefile.mk b/writerfilter/qa/cppunittests/odiapi/makefile.mk
deleted file mode 100644
index 5349060..0000000
--- a/writerfilter/qa/cppunittests/odiapi/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-PRJ=..$/..$/..
-
-PRJNAME=writerfilter
-TARGET=test-odiapi
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-SHL1OBJS=\
- $(SLO)$/testProperty.obj \
- $(SLO)$/FileLoggerImpl.obj\
- $(SLO)$/ExternalViewLogger.obj\
- $(SLO)$/testCore.obj
-
-SHL1TARGET=$(TARGET)
-SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB)
-
-.IF "$(OS)"=="WNT"
-SHL1STDLIBS+= $(LB)$/iodiapi.lib
-.ELIF "$(OS)"!="WNT" && "$(OS)"!="MACOSX"
-SHL1STDLIBS+=$(LB)$/libodiapi.so
-.ELIF "$(OS)"=="MACOSX"
-SHL1STDLIBS+=$(LB)$/libodiapi.dylib
-.ENDIF
-
-SHL1IMPLIB= i$(SHL1TARGET)
-
-DEF1NAME =$(SHL1TARGET)
-
-SHL1VERSIONMAP = export.map
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
diff --git a/writerfilter/qa/cppunittests/qname/makefile.mk b/writerfilter/qa/cppunittests/qname/makefile.mk
deleted file mode 100644
index 82fe397..0000000
--- a/writerfilter/qa/cppunittests/qname/makefile.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-PRJ=..$/..$/..
-
-PRJNAME=writerfilter
-TARGET=test-qname
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl
-
-.IF "$(OS)" == "WNT"
- CFLAGS+=/Ob1
-.ENDIF
-
-SHL1OBJS=\
- $(SLO)$/testQName.obj
-
-SHL1TARGET=$(TARGET)
-
-SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB)
-
-.IF "$(OS)" == "WNT"
-SHL1STDLIBS+= $(LB)$/iodiapi.lib
-.ENDIF
-.IF "$(OS)" != "WNT"
-SHL1STDLIBS+=$(LB)$/libodiapi.so
-.ENDIF
-
-SHL1IMPLIB= i$(SHL1TARGET)
-
-# SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME =$(SHL1TARGET)
-
-# DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP = export.map
-
-
-# END ------------------------------------------------------------------
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
More information about the Libreoffice-commits
mailing list