From 66561c1f9836bdecc5c3989c42a94aa7be0958f8 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 16 Jun 2012 05:38:37 -0500 Subject: revert gmk4 Change-Id: I4b78a8efeadf47f8fa3f30a87433d3ccb9c1beb1 --- ucbhelper/Library_ucbhelper.mk | 85 ------------------------------------------ ucbhelper/Module_ucbhelper.mk | 39 ------------------- ucbhelper/Package_inc.mk | 61 ------------------------------ 3 files changed, 185 deletions(-) delete mode 100644 ucbhelper/Library_ucbhelper.mk delete mode 100644 ucbhelper/Module_ucbhelper.mk delete mode 100644 ucbhelper/Package_inc.mk (limited to 'ucbhelper') diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk deleted file mode 100644 index 7de5f82cd96e..000000000000 --- 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 -# -# 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 05a561740fff..000000000000 --- 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 -# -# 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 25a197ebd47a..000000000000 --- 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 -# -# 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: -- cgit