[Libreoffice-commits] .: 4 commits - sax/CppunitTest_sax.mk sax/inc sax/Library_expwrap.mk sax/Library_fastsax.mk sax/Library_sax.mk sax/Module_sax.mk sax/Package_inc.mk sax/source ucbhelper/Library_ucbhelper.mk ucbhelper/Module_ucbhelper.mk ucbhelper/Package_inc.mk
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sat Jun 16 05:01:08 PDT 2012
sax/CppunitTest_sax.mk | 47 +++++-----------
sax/Library_expwrap.mk | 55 ++++++-------------
sax/Library_fastsax.mk | 56 ++++++-------------
sax/Library_sax.mk | 65 ++++++++--------------
sax/Module_sax.mk | 37 +++---------
sax/Package_inc.mk | 32 ++---------
sax/inc/sax/dllapi.h | 42 --------------
sax/inc/sax/fastattribs.hxx | 2
sax/inc/sax/fshelper.hxx | 1
sax/inc/sax/parser/saxparser.hxx | 1
sax/inc/sax/saxdllapi.h | 42 ++++++++++++++
sax/inc/sax/tools/attributemap.hxx | 2
sax/inc/sax/tools/saxobject.hxx | 2
sax/inc/sax/tools/tokenmap.hxx | 1
sax/source/tools/fastserializer.hxx | 1
ucbhelper/Library_ucbhelper.mk | 103 +++++++++++++-----------------------
ucbhelper/Module_ucbhelper.mk | 30 +---------
ucbhelper/Package_inc.mk | 70 +++++++++---------------
18 files changed, 207 insertions(+), 382 deletions(-)
New commits:
commit 3be786451b6a9accc46a08f0aed4f8d5a8794ffe
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 16 06:58:09 2012 -0500
gbuildification of sax
Change-Id: I6e8220e88566e04b20687d54181205d31ec68e13
diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk
new file mode 100644
index 0000000..493cb76
--- /dev/null
+++ b/sax/CppunitTest_sax.mk
@@ -0,0 +1,28 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,sax_cpputest))
+
+$(eval $(call gb_CppunitTest_use_api,sax_cpputest,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sax_cpputest, \
+ sax \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sax_cpputest, \
+ sax/qa/cppunit/test_converter \
+))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
new file mode 100644
index 0000000..dca2b33
--- /dev/null
+++ b/sax/Library_expwrap.mk
@@ -0,0 +1,44 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Library_Library,expwrap))
+
+$(eval $(call gb_Library_set_componentfile,expwrap,sax/source/expatwrap/expwrap))
+
+
+$(eval $(call gb_Library_use_api,expwrap,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_use_externals,expwrap,\
+ expat_utf16 \
+))
+
+$(eval $(call gb_Library_use_libraries,expwrap,\
+ cppu \
+ cppuhelper \
+ sal \
+ sax \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_set_include,expwrap,\
+ -I$(SRCDIR)/sax/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,expwrap,\
+ sax/source/expatwrap/attrlistimpl \
+ sax/source/expatwrap/sax_expat \
+ sax/source/expatwrap/saxwriter \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
new file mode 100644
index 0000000..e866cb8
--- /dev/null
+++ b/sax/Library_fastsax.mk
@@ -0,0 +1,42 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Library_Library,fastsax))
+
+$(eval $(call gb_Library_set_componentfile,fastsax,sax/source/fastparser/fastsax))
+
+$(eval $(call gb_Library_use_api,fastsax,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_use_externals,fastsax,\
+ expat_utf8 \
+ zlib \
+))
+
+$(eval $(call gb_Library_use_libraries,fastsax,\
+ cppu \
+ cppuhelper \
+ sal \
+ sax \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_include,fastsax,\
+ -I$(SRCDIR)/sax/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fastsax,\
+ sax/source/fastparser/facreg \
+ sax/source/fastparser/fastparser \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk
new file mode 100644
index 0000000..9b6b860
--- /dev/null
+++ b/sax/Library_sax.mk
@@ -0,0 +1,46 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Library_Library,sax))
+
+$(eval $(call gb_Library_use_package,sax,\
+ sax_inc \
+))
+
+$(eval $(call gb_Library_use_api,sax,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_use_libraries,sax,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_include,sax,\
+ -I$(SRCDIR)/sax/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_defs,sax,\
+ -DSAX_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_exception_objects,sax,\
+ sax/source/expatwrap/xml2utf \
+ sax/source/tools/converter \
+ sax/source/tools/fastattribs \
+ sax/source/tools/fastserializer \
+ sax/source/tools/fshelper \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sax/Module_sax.mk b/sax/Module_sax.mk
new file mode 100644
index 0000000..2ad7bf1
--- /dev/null
+++ b/sax/Module_sax.mk
@@ -0,0 +1,23 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Module_Module,sax))
+
+$(eval $(call gb_Module_add_targets,sax,\
+ Library_expwrap \
+ Library_fastsax \
+ Library_sax \
+ Package_inc \
+))
+
+$(eval $(call gb_Module_add_check_targets,sax,\
+ CppunitTest_sax \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sax/Package_inc.mk b/sax/Package_inc.mk
new file mode 100644
index 0000000..8cf8114
--- /dev/null
+++ b/sax/Package_inc.mk
@@ -0,0 +1,18 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Package_Package,sax_inc,$(SRCDIR)/sax/inc))
+
+$(eval $(call gb_Package_add_file,sax_inc,inc/sax/fastattribs.hxx,sax/fastattribs.hxx))
+$(eval $(call gb_Package_add_file,sax_inc,inc/sax/fshelper.hxx,sax/fshelper.hxx))
+$(eval $(call gb_Package_add_file,sax_inc,inc/sax/saxdllapi.h,sax/saxdllapi.h))
+$(eval $(call gb_Package_add_file,sax_inc,inc/sax/tools/converter.hxx,sax/tools/converter.hxx))
+$(eval $(call gb_Package_add_file,sax_inc,inc/sax/tools/documenthandleradapter.hxx,sax/tools/documenthandleradapter.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sax/inc/sax/dllapi.h b/sax/inc/sax/dllapi.h
deleted file mode 100644
index 1e49047..0000000
--- a/sax/inc/sax/dllapi.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef INCLUDED_SAX_DLLAPI_H
-#define INCLUDED_SAX_DLLAPI_H
-
-#include "sal/types.h"
-
-#if defined SAX_DLLIMPLEMENTATION
-#define SAX_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define SAX_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sax/inc/sax/fastattribs.hxx b/sax/inc/sax/fastattribs.hxx
index 6759b58..1db74e1 100644
--- a/sax/inc/sax/fastattribs.hxx
+++ b/sax/inc/sax/fastattribs.hxx
@@ -35,7 +35,7 @@
#include <com/sun/star/xml/FastAttribute.hpp>
#include <cppuhelper/implbase1.hxx>
-#include "sax/dllapi.h"
+#include "sax/saxdllapi.h"
#include <map>
#include <vector>
diff --git a/sax/inc/sax/fshelper.hxx b/sax/inc/sax/fshelper.hxx
index 73d04eb..9278081 100644
--- a/sax/inc/sax/fshelper.hxx
+++ b/sax/inc/sax/fshelper.hxx
@@ -35,7 +35,6 @@
#include <stdarg.h>
#include <boost/shared_ptr.hpp>
#include <sax/fastattribs.hxx>
-#include "sax/dllapi.h"
#define FSNS(namespc, element) ((namespc << 16) | element)
const sal_Int32 FSEND = -1; // same as XML_TOKEN_INVALID
diff --git a/sax/inc/sax/parser/saxparser.hxx b/sax/inc/sax/parser/saxparser.hxx
index 16bd1a3..d8235df 100644
--- a/sax/inc/sax/parser/saxparser.hxx
+++ b/sax/inc/sax/parser/saxparser.hxx
@@ -29,7 +29,6 @@
#ifndef _SAX_SAXPARSER_HXX_
#define _SAX_SAXPARSER_HXX_
-#include "sax/dllapi.h"
#include <com/sun/star/xml/sax/InputSource.hpp>
#include <com/sun/star/xml/sax/SAXException.hpp>
#include <rtl/ref.hxx>
diff --git a/sax/inc/sax/saxdllapi.h b/sax/inc/sax/saxdllapi.h
new file mode 100644
index 0000000..7602424
--- /dev/null
+++ b/sax/inc/sax/saxdllapi.h
@@ -0,0 +1,42 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_SAX_DLLAPI_H
+#define INCLUDED_SAX_DLLAPI_H
+
+#include <sal/types.h>
+
+#if defined SAX_DLLIMPLEMENTATION
+#define SAX_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define SAX_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sax/inc/sax/tools/attributemap.hxx b/sax/inc/sax/tools/attributemap.hxx
index 7a867c9..579356e 100644
--- a/sax/inc/sax/tools/attributemap.hxx
+++ b/sax/inc/sax/tools/attributemap.hxx
@@ -29,8 +29,6 @@
#ifndef _SAX_ATTRIBUTEMAP_HXX_
#define _SAX_ATTRIBUTEMAP_HXX_
-#include "sax/dllapi.h"
-
#include <map>
#include "sax/tools/tokenmap.hxx"
diff --git a/sax/inc/sax/tools/saxobject.hxx b/sax/inc/sax/tools/saxobject.hxx
index ee72cee..4a1fba4 100644
--- a/sax/inc/sax/tools/saxobject.hxx
+++ b/sax/inc/sax/tools/saxobject.hxx
@@ -30,7 +30,7 @@
#define _SAX_OBJECT_HXX_
#include <sal/types.h>
-#include "sax/dllapi.h"
+#include "sax/saxdllapi.h"
namespace sax
{
diff --git a/sax/inc/sax/tools/tokenmap.hxx b/sax/inc/sax/tools/tokenmap.hxx
index 8749a65..71704f0 100644
--- a/sax/inc/sax/tools/tokenmap.hxx
+++ b/sax/inc/sax/tools/tokenmap.hxx
@@ -31,7 +31,6 @@
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
-#include "sax/dllapi.h"
#include "sax/tools/saxobject.hxx"
namespace sax
diff --git a/sax/source/tools/fastserializer.hxx b/sax/source/tools/fastserializer.hxx
index 0b0730d..5574ec6 100644
--- a/sax/source/tools/fastserializer.hxx
+++ b/sax/source/tools/fastserializer.hxx
@@ -41,7 +41,6 @@
#include <boost/shared_ptr.hpp>
-#include "sax/dllapi.h"
#include "sax/fshelper.hxx"
#define SERIALIZER_IMPLEMENTATION_NAME "com.sun.star.comp.extensions.xml.sax.FastSerializer"
commit 445cb2bcda1d9b186a250a5c2d91d03d3f3888ed
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 16 06:01:16 2012 -0500
revert gmk4
Change-Id: I5e364dc0c387d85f7901d1e86968f5e591639f9f
diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk
deleted file mode 100644
index 2e141e7..0000000
--- a/sax/CppunitTest_sax.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_CppunitTest_CppunitTest,sax_cppunit))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sax_cppunit, \
- sax/qa/cppunit/test_converter \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sax_cppunit, \
- sax \
- sal \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sax_cppunit,\
- offapi \
- udkapi \
-))
-# vim: set noet sw=4 ts=4:
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
deleted file mode 100644
index b786426..0000000
--- a/sax/Library_expwrap.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Library_Library,expwrap))
-
-$(eval $(call gb_Library_set_componentfile,expwrap,sax/source/expatwrap/expwrap))
-
-$(eval $(call gb_Library_set_include,expwrap,\
- $$(INCLUDE) \
- -I$(SRCDIR)/sax/inc \
-))
-
-$(eval $(call gb_Library_use_api,expwrap,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_Library_use_libraries,expwrap,\
- cppu \
- cppuhelper \
- sal \
- sax \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Library_use_external,expwrap,expat_utf16))
-
-$(eval $(call gb_Library_add_exception_objects,expwrap,\
- sax/source/expatwrap/attrlistimpl \
- sax/source/expatwrap/sax_expat \
- sax/source/expatwrap/saxwriter \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
deleted file mode 100644
index a06b276..0000000
--- a/sax/Library_fastsax.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Library_Library,fastsax))
-
-$(eval $(call gb_Library_set_componentfile,fastsax,sax/source/fastparser/fastsax))
-
-$(eval $(call gb_Library_set_include,fastsax,\
- $$(INCLUDE) \
- -I$(SRCDIR)/sax/inc \
-))
-
-$(eval $(call gb_Library_use_api,fastsax,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_Library_use_libraries,fastsax,\
- cppu \
- cppuhelper \
- sal \
- sax \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Library_use_external,fastsax,zlib))
-
-$(eval $(call gb_Library_use_external,fastsax,expat_utf8))
-
-$(eval $(call gb_Library_add_exception_objects,fastsax,\
- sax/source/fastparser/facreg \
- sax/source/fastparser/fastparser \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk
deleted file mode 100644
index 08518e5..0000000
--- a/sax/Library_sax.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Library_Library,sax))
-
-$(eval $(call gb_Library_use_package,sax,\
- sax_inc \
-))
-
-$(eval $(call gb_Library_set_include,sax,\
- $$(INCLUDE) \
- -I$(SRCDIR)/sax/inc \
-))
-
-$(eval $(call gb_Library_use_api,sax,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_Library_add_defs,sax,\
- -DSAX_DLLIMPLEMENTATION \
-))
-
-$(eval $(call gb_Library_use_libraries,sax,\
- comphelper \
- cppu \
- cppuhelper \
- sal \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Library_add_exception_objects,sax,\
- sax/source/tools/converter \
- sax/source/tools/fastattribs \
- sax/source/tools/fastserializer \
- sax/source/tools/fshelper \
- sax/source/expatwrap/xml2utf \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sax/Module_sax.mk b/sax/Module_sax.mk
deleted file mode 100644
index c76d0c8..0000000
--- a/sax/Module_sax.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Module_Module,sax))
-
-$(eval $(call gb_Module_add_targets,sax,\
- Library_sax \
- Library_expwrap \
- Library_fastsax \
- Package_inc \
-))
-
-$(eval $(call gb_Module_add_check_targets,sax,\
- CppunitTest_sax \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sax/Package_inc.mk b/sax/Package_inc.mk
deleted file mode 100644
index 9dd0444..0000000
--- a/sax/Package_inc.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Package_Package,sax_inc,$(SRCDIR)/sax/inc))
-$(eval $(call gb_Package_add_file,sax_inc,inc/sax/dllapi.h,sax/dllapi.h))
-$(eval $(call gb_Package_add_file,sax_inc,inc/sax/fshelper.hxx,sax/fshelper.hxx))
-$(eval $(call gb_Package_add_file,sax_inc,inc/sax/fastattribs.hxx,sax/fastattribs.hxx))
-$(eval $(call gb_Package_add_file,sax_inc,inc/sax/tools/converter.hxx,sax/tools/converter.hxx))
-$(eval $(call gb_Package_add_file,sax_inc,inc/sax/tools/documenthandleradapter.hxx,sax/tools/documenthandleradapter.hxx))
-
-# vim: set noet sw=4 ts=4:
commit bc353f6b3632d41aa60a938355cbb48162695d38
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 16 05:58:01 2012 -0500
gbuildification of ucbhelper
Change-Id: I1fb3d36af07fe834cddc06c54d27a786dc583c8c
diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk
new file mode 100644
index 0000000..676741e
--- /dev/null
+++ b/ucbhelper/Library_ucbhelper.mk
@@ -0,0 +1,62 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Library_Library,ucbhelper))
+
+$(eval $(call gb_Library_use_package,ucbhelper,ucbhelper_inc))
+
+$(eval $(call gb_Library_use_api,ucbhelper,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_use_libraries,ucbhelper,\
+ cppu \
+ cppuhelper \
+ sal \
+ salhelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_defs,ucbhelper,\
+ -DUCBHELPER_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ucbhelper,\
+ ucbhelper/source/client/activedatasink \
+ ucbhelper/source/client/activedatastreamer \
+ ucbhelper/source/client/commandenvironment \
+ ucbhelper/source/client/content \
+ ucbhelper/source/client/contentbroker \
+ ucbhelper/source/client/fileidentifierconverter \
+ ucbhelper/source/client/interceptedinteraction \
+ ucbhelper/source/client/proxydecider \
+ ucbhelper/source/provider/cancelcommandexecution \
+ ucbhelper/source/provider/contenthelper \
+ ucbhelper/source/provider/contentidentifier \
+ ucbhelper/source/provider/contentinfo \
+ ucbhelper/source/provider/fd_inputstream \
+ ucbhelper/source/provider/interactionrequest \
+ ucbhelper/source/provider/propertyvalueset \
+ ucbhelper/source/provider/providerhelper \
+ ucbhelper/source/provider/registerucb \
+ ucbhelper/source/provider/resultset \
+ ucbhelper/source/provider/resultsethelper \
+ ucbhelper/source/provider/resultsetmetadata \
+ ucbhelper/source/provider/simpleauthenticationrequest \
+ ucbhelper/source/provider/simplecertificatevalidationrequest \
+ ucbhelper/source/provider/simpleinteractionrequest \
+ ucbhelper/source/provider/simpleioerrorrequest \
+ ucbhelper/source/provider/simplenameclashresolverequest \
+ ucbhelper/source/provider/std_inputstream \
+ ucbhelper/source/provider/std_outputstream \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/ucbhelper/Module_ucbhelper.mk b/ucbhelper/Module_ucbhelper.mk
new file mode 100644
index 0000000..337e955
--- /dev/null
+++ b/ucbhelper/Module_ucbhelper.mk
@@ -0,0 +1,17 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Module_Module,ucbhelper))
+
+$(eval $(call gb_Module_add_targets,ucbhelper,\
+ Library_ucbhelper \
+ Package_inc \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ucbhelper/Package_inc.mk b/ucbhelper/Package_inc.mk
new file mode 100644
index 0000000..7df94fe
--- /dev/null
+++ b/ucbhelper/Package_inc.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Package_Package,ucbhelper_inc,$(SRCDIR)/ucbhelper/inc))
+
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/activedatasink.hxx,ucbhelper/activedatasink.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/activedatastreamer.hxx,ucbhelper/activedatastreamer.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/cancelcommandexecution.hxx,ucbhelper/cancelcommandexecution.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/commandenvironment.hxx,ucbhelper/commandenvironment.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/configurationkeys.hxx,ucbhelper/configurationkeys.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/content.hxx,ucbhelper/content.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/contentbroker.hxx,ucbhelper/contentbroker.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/contenthelper.hxx,ucbhelper/contenthelper.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/contentidentifier.hxx,ucbhelper/contentidentifier.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/contentinfo.hxx,ucbhelper/contentinfo.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/fd_inputstream.hxx,ucbhelper/fd_inputstream.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/fileidentifierconverter.hxx,ucbhelper/fileidentifierconverter.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/interactionrequest.hxx,ucbhelper/interactionrequest.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/interceptedinteraction.hxx,ucbhelper/interceptedinteraction.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/macros.hxx,ucbhelper/macros.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/propertyvalueset.hxx,ucbhelper/propertyvalueset.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/providerhelper.hxx,ucbhelper/providerhelper.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/proxydecider.hxx,ucbhelper/proxydecider.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/registerucb.hxx,ucbhelper/registerucb.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/resultset.hxx,ucbhelper/resultset.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/resultsethelper.hxx,ucbhelper/resultsethelper.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/resultsetmetadata.hxx,ucbhelper/resultsetmetadata.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simpleauthenticationrequest.hxx,ucbhelper/simpleauthenticationrequest.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simplecertificatevalidationrequest.hxx,ucbhelper/simplecertificatevalidationrequest.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simpleinteractionrequest.hxx,ucbhelper/simpleinteractionrequest.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simpleioerrorrequest.hxx,ucbhelper/simpleioerrorrequest.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simplenameclashresolverequest.hxx,ucbhelper/simplenameclashresolverequest.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/std_inputstream.hxx,ucbhelper/std_inputstream.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/std_outputstream.hxx,ucbhelper/std_outputstream.hxx))
+$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/ucbhelperdllapi.h,ucbhelper/ucbhelperdllapi.h))
+
+# vim: set noet sw=4 ts=4:
commit 66561c1f9836bdecc5c3989c42a94aa7be0958f8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 16 05:38:37 2012 -0500
revert gmk4
Change-Id: I4b78a8efeadf47f8fa3f30a87433d3ccb9c1beb1
diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk
deleted file mode 100644
index 7de5f82..0000000
--- a/ucbhelper/Library_ucbhelper.mk
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Library_Library,ucbhelper))
-
-$(eval $(call gb_Library_use_package,ucbhelper,ucbhelper_inc))
-
-$(eval $(call gb_Library_set_include,ucbhelper,\
- $$(INCLUDE) \
- -I$(SRCDIR)/ucbhelper/inc \
-))
-
-$(eval $(call gb_Library_add_defs,ucbhelper,\
- -DUCBHELPER_DLLIMPLEMENTATION \
-))
-
-$(eval $(call gb_Library_use_api,ucbhelper,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_Library_use_libraries,ucbhelper,\
- cppu \
- cppuhelper \
- sal \
- salhelper \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Library_add_exception_objects,ucbhelper,\
- ucbhelper/source/provider/simpleauthenticationrequest \
- ucbhelper/source/provider/simpleioerrorrequest \
- ucbhelper/source/provider/cancelcommandexecution \
- ucbhelper/source/provider/contenthelper \
- ucbhelper/source/provider/propertyvalueset \
- ucbhelper/source/provider/resultset \
- ucbhelper/source/provider/resultsetmetadata \
- ucbhelper/source/provider/simplecertificatevalidationrequest \
- ucbhelper/source/provider/contentidentifier \
- ucbhelper/source/provider/resultsethelper \
- ucbhelper/source/provider/simplenameclashresolverequest \
- ucbhelper/source/provider/simpleinteractionrequest \
- ucbhelper/source/provider/registerucb \
- ucbhelper/source/provider/contentinfo \
- ucbhelper/source/provider/interactionrequest \
- ucbhelper/source/provider/providerhelper \
- ucbhelper/source/provider/fd_inputstream \
- ucbhelper/source/provider/std_inputstream \
- ucbhelper/source/provider/std_outputstream \
- ucbhelper/source/client/proxydecider \
- ucbhelper/source/client/content \
- ucbhelper/source/client/contentbroker \
- ucbhelper/source/client/commandenvironment \
- ucbhelper/source/client/activedatastreamer \
- ucbhelper/source/client/fileidentifierconverter \
- ucbhelper/source/client/interceptedinteraction \
- ucbhelper/source/client/activedatasink \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/ucbhelper/Module_ucbhelper.mk b/ucbhelper/Module_ucbhelper.mk
deleted file mode 100644
index 05a5617..0000000
--- a/ucbhelper/Module_ucbhelper.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# replace ucbhelper by the name of the module you are creating
-
-$(eval $(call gb_Module_Module,ucbhelper))
-
-# the targets to be inserted are their file names without .mk extension
-$(eval $(call gb_Module_add_targets,ucbhelper,\
- Library_ucbhelper \
- Package_inc \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/ucbhelper/Package_inc.mk b/ucbhelper/Package_inc.mk
deleted file mode 100644
index 25a197e..0000000
--- a/ucbhelper/Package_inc.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Package_Package,ucbhelper_inc,$(SRCDIR)/ucbhelper/inc))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/contentbroker.hxx,ucbhelper/contentbroker.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simpleauthenticationrequest.hxx,ucbhelper/simpleauthenticationrequest.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/propertyvalueset.hxx,ucbhelper/propertyvalueset.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/contentinfo.hxx,ucbhelper/contentinfo.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/resultsetmetadata.hxx,ucbhelper/resultsetmetadata.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/contenthelper.hxx,ucbhelper/contenthelper.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/activedatasink.hxx,ucbhelper/activedatasink.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/commandenvironment.hxx,ucbhelper/commandenvironment.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/interceptedinteraction.hxx,ucbhelper/interceptedinteraction.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/resultset.hxx,ucbhelper/resultset.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/ucbhelperdllapi.h,ucbhelper/ucbhelperdllapi.h))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simpleinteractionrequest.hxx,ucbhelper/simpleinteractionrequest.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simpleioerrorrequest.hxx,ucbhelper/simpleioerrorrequest.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/interactionrequest.hxx,ucbhelper/interactionrequest.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/activedatastreamer.hxx,ucbhelper/activedatastreamer.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/content.hxx,ucbhelper/content.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simplecertificatevalidationrequest.hxx,ucbhelper/simplecertificatevalidationrequest.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/proxydecider.hxx,ucbhelper/proxydecider.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/fileidentifierconverter.hxx,ucbhelper/fileidentifierconverter.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/cancelcommandexecution.hxx,ucbhelper/cancelcommandexecution.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/registerucb.hxx,ucbhelper/registerucb.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/resultsethelper.hxx,ucbhelper/resultsethelper.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/configurationkeys.hxx,ucbhelper/configurationkeys.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/contentidentifier.hxx,ucbhelper/contentidentifier.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/providerhelper.hxx,ucbhelper/providerhelper.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simplenameclashresolverequest.hxx,ucbhelper/simplenameclashresolverequest.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/macros.hxx,ucbhelper/macros.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/fd_inputstream.hxx,ucbhelper/fd_inputstream.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/std_inputstream.hxx,ucbhelper/std_inputstream.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/std_outputstream.hxx,ucbhelper/std_outputstream.hxx))
-
-# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list