[Libreoffice-commits] .: comphelper/Library_comphelp.mk comphelper/Library_comphelper.mk comphelper/Module_comphelper.mk

Michael Stahl mst at kemper.freedesktop.org
Thu May 3 15:28:06 PDT 2012


 comphelper/Library_comphelp.mk   |  153 ---------------------------------------
 comphelper/Library_comphelper.mk |  153 +++++++++++++++++++++++++++++++++++++++
 comphelper/Module_comphelper.mk  |    2 
 3 files changed, 154 insertions(+), 154 deletions(-)

New commits:
commit 326d255eaa2cde1d4ffff87a0a3a5074a326513f
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri May 4 00:25:37 2012 +0200

    rename Library_comphelp.mk to Library_comphelper.mk...
    
    ... so the silly broken gb_Symbols_get_all enables debug for it.

diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk
deleted file mode 100644
index 2e46bfd..0000000
--- a/comphelper/Library_comphelp.mk
+++ /dev/null
@@ -1,153 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2009 by Sun Microsystems, Inc.
-#
-# 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,comphelper))
-
-$(eval $(call gb_Library_use_package,comphelper,comphelper_inc))
-
-$(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp))
-
-$(eval $(call gb_Library_set_include,comphelper,\
-    -I$(SRCDIR)/comphelper/source/inc \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_Library_add_defs,comphelper,\
-       -DCOMPHELPER_DLLIMPLEMENTATION \
-))
-
-$(eval $(call gb_Library_use_libraries,comphelper,\
-    cppu \
-    cppuhelper \
-    sal \
-    salhelper \
-    ucbhelper \
-    $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Library_use_api,comphelper,\
-	udkapi \
-	offapi \
-))
-
-$(eval $(call gb_Library_add_exception_objects,comphelper,\
-    comphelper/source/compare/AnyCompareFactory \
-    comphelper/source/container/IndexedPropertyValuesContainer \
-    comphelper/source/container/NamedPropertyValuesContainer \
-    comphelper/source/container/container \
-    comphelper/source/container/containermultiplexer \
-    comphelper/source/container/embeddedobjectcontainer \
-    comphelper/source/container/enumerablemap \
-    comphelper/source/container/enumhelper \
-    comphelper/source/container/namecontainer \
-    comphelper/source/eventattachermgr/eventattachermgr \
-    comphelper/source/misc/accessiblecomponenthelper \
-    comphelper/source/misc/accessiblecontexthelper \
-    comphelper/source/misc/accessibleeventnotifier \
-    comphelper/source/misc/accessiblekeybindinghelper \
-    comphelper/source/misc/accessibleselectionhelper \
-    comphelper/source/misc/accessibletexthelper \
-    comphelper/source/misc/accessiblewrapper \
-    comphelper/source/misc/accimplaccess \
-    comphelper/source/misc/anytostring \
-    comphelper/source/misc/asyncnotification \
-    comphelper/source/misc/comphelper_module \
-    comphelper/source/misc/comphelper_services \
-    comphelper/source/misc/componentbase \
-    comphelper/source/misc/componentcontext \
-    comphelper/source/misc/componentmodule \
-    comphelper/source/misc/configuration \
-    comphelper/source/misc/configurationhelper \
-    comphelper/source/misc/docpasswordhelper \
-    comphelper/source/misc/docpasswordrequest \
-    comphelper/source/misc/documentinfo \
-    comphelper/source/misc/documentiologring \
-    comphelper/source/misc/evtlistenerhlp \
-    comphelper/source/misc/evtmethodhelper \
-    comphelper/source/misc/ihwrapnofilter \
-    comphelper/source/misc/instancelocker \
-    comphelper/source/misc/interaction \
-    comphelper/source/misc/listenernotification \
-    comphelper/source/misc/locale \
-    comphelper/source/misc/logging \
-    comphelper/source/misc/mediadescriptor \
-    comphelper/source/misc/mimeconfighelper \
-    comphelper/source/misc/namedvaluecollection \
-    comphelper/source/misc/numberedcollection \
-    comphelper/source/misc/numbers \
-    comphelper/source/misc/officeresourcebundle \
-    comphelper/source/misc/officerestartmanager \
-    comphelper/source/misc/proxyaggregation \
-    comphelper/source/misc/scopeguard \
-    comphelper/source/misc/SelectionMultiplex \
-    comphelper/source/misc/sequenceashashmap \
-    comphelper/source/misc/sequence \
-    comphelper/source/misc/servicedecl \
-    comphelper/source/misc/serviceinfohelper \
-    comphelper/source/misc/sharedmutex \
-    comphelper/source/misc/stillreadwriteinteraction \
-    comphelper/source/misc/anycompare \
-    comphelper/source/misc/storagehelper \
-    comphelper/source/misc/string \
-    comphelper/source/misc/synchronousdispatch \
-    comphelper/source/misc/types \
-    comphelper/source/misc/weak \
-    comphelper/source/misc/weakeventlistener \
-    comphelper/source/officeinstdir/officeinstallationdirectories \
-    comphelper/source/processfactory/processfactory \
-    comphelper/source/property/ChainablePropertySet \
-    comphelper/source/property/ChainablePropertySetInfo \
-    comphelper/source/property/genericpropertyset \
-    comphelper/source/property/MasterPropertySet \
-    comphelper/source/property/MasterPropertySetInfo \
-    comphelper/source/property/opropertybag \
-    comphelper/source/property/propagg \
-    comphelper/source/property/propertybag \
-    comphelper/source/property/propertycontainer \
-    comphelper/source/property/propertycontainerhelper \
-    comphelper/source/property/property \
-    comphelper/source/property/propertysethelper \
-    comphelper/source/property/propertysetinfo \
-    comphelper/source/property/propertystatecontainer \
-    comphelper/source/property/propmultiplex \
-    comphelper/source/property/propstate \
-    comphelper/source/property/TypeGeneration \
-    comphelper/source/streaming/basicio \
-    comphelper/source/streaming/memorystream \
-    comphelper/source/streaming/oslfile2streamwrap \
-    comphelper/source/streaming/seekableinput \
-    comphelper/source/streaming/seqinputstreamserv \
-    comphelper/source/streaming/seqoutputstreamserv \
-    comphelper/source/streaming/seqstream \
-    comphelper/source/streaming/streamsection \
-    comphelper/source/xml/attributelist \
-    comphelper/source/xml/ofopxmlhelper \
-    comphelper/source/xml/xmltools \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
new file mode 100644
index 0000000..2e46bfd
--- /dev/null
+++ b/comphelper/Library_comphelper.mk
@@ -0,0 +1,153 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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,comphelper))
+
+$(eval $(call gb_Library_use_package,comphelper,comphelper_inc))
+
+$(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp))
+
+$(eval $(call gb_Library_set_include,comphelper,\
+    -I$(SRCDIR)/comphelper/source/inc \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_defs,comphelper,\
+       -DCOMPHELPER_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_use_libraries,comphelper,\
+    cppu \
+    cppuhelper \
+    sal \
+    salhelper \
+    ucbhelper \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_use_api,comphelper,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_add_exception_objects,comphelper,\
+    comphelper/source/compare/AnyCompareFactory \
+    comphelper/source/container/IndexedPropertyValuesContainer \
+    comphelper/source/container/NamedPropertyValuesContainer \
+    comphelper/source/container/container \
+    comphelper/source/container/containermultiplexer \
+    comphelper/source/container/embeddedobjectcontainer \
+    comphelper/source/container/enumerablemap \
+    comphelper/source/container/enumhelper \
+    comphelper/source/container/namecontainer \
+    comphelper/source/eventattachermgr/eventattachermgr \
+    comphelper/source/misc/accessiblecomponenthelper \
+    comphelper/source/misc/accessiblecontexthelper \
+    comphelper/source/misc/accessibleeventnotifier \
+    comphelper/source/misc/accessiblekeybindinghelper \
+    comphelper/source/misc/accessibleselectionhelper \
+    comphelper/source/misc/accessibletexthelper \
+    comphelper/source/misc/accessiblewrapper \
+    comphelper/source/misc/accimplaccess \
+    comphelper/source/misc/anytostring \
+    comphelper/source/misc/asyncnotification \
+    comphelper/source/misc/comphelper_module \
+    comphelper/source/misc/comphelper_services \
+    comphelper/source/misc/componentbase \
+    comphelper/source/misc/componentcontext \
+    comphelper/source/misc/componentmodule \
+    comphelper/source/misc/configuration \
+    comphelper/source/misc/configurationhelper \
+    comphelper/source/misc/docpasswordhelper \
+    comphelper/source/misc/docpasswordrequest \
+    comphelper/source/misc/documentinfo \
+    comphelper/source/misc/documentiologring \
+    comphelper/source/misc/evtlistenerhlp \
+    comphelper/source/misc/evtmethodhelper \
+    comphelper/source/misc/ihwrapnofilter \
+    comphelper/source/misc/instancelocker \
+    comphelper/source/misc/interaction \
+    comphelper/source/misc/listenernotification \
+    comphelper/source/misc/locale \
+    comphelper/source/misc/logging \
+    comphelper/source/misc/mediadescriptor \
+    comphelper/source/misc/mimeconfighelper \
+    comphelper/source/misc/namedvaluecollection \
+    comphelper/source/misc/numberedcollection \
+    comphelper/source/misc/numbers \
+    comphelper/source/misc/officeresourcebundle \
+    comphelper/source/misc/officerestartmanager \
+    comphelper/source/misc/proxyaggregation \
+    comphelper/source/misc/scopeguard \
+    comphelper/source/misc/SelectionMultiplex \
+    comphelper/source/misc/sequenceashashmap \
+    comphelper/source/misc/sequence \
+    comphelper/source/misc/servicedecl \
+    comphelper/source/misc/serviceinfohelper \
+    comphelper/source/misc/sharedmutex \
+    comphelper/source/misc/stillreadwriteinteraction \
+    comphelper/source/misc/anycompare \
+    comphelper/source/misc/storagehelper \
+    comphelper/source/misc/string \
+    comphelper/source/misc/synchronousdispatch \
+    comphelper/source/misc/types \
+    comphelper/source/misc/weak \
+    comphelper/source/misc/weakeventlistener \
+    comphelper/source/officeinstdir/officeinstallationdirectories \
+    comphelper/source/processfactory/processfactory \
+    comphelper/source/property/ChainablePropertySet \
+    comphelper/source/property/ChainablePropertySetInfo \
+    comphelper/source/property/genericpropertyset \
+    comphelper/source/property/MasterPropertySet \
+    comphelper/source/property/MasterPropertySetInfo \
+    comphelper/source/property/opropertybag \
+    comphelper/source/property/propagg \
+    comphelper/source/property/propertybag \
+    comphelper/source/property/propertycontainer \
+    comphelper/source/property/propertycontainerhelper \
+    comphelper/source/property/property \
+    comphelper/source/property/propertysethelper \
+    comphelper/source/property/propertysetinfo \
+    comphelper/source/property/propertystatecontainer \
+    comphelper/source/property/propmultiplex \
+    comphelper/source/property/propstate \
+    comphelper/source/property/TypeGeneration \
+    comphelper/source/streaming/basicio \
+    comphelper/source/streaming/memorystream \
+    comphelper/source/streaming/oslfile2streamwrap \
+    comphelper/source/streaming/seekableinput \
+    comphelper/source/streaming/seqinputstreamserv \
+    comphelper/source/streaming/seqoutputstreamserv \
+    comphelper/source/streaming/seqstream \
+    comphelper/source/streaming/streamsection \
+    comphelper/source/xml/attributelist \
+    comphelper/source/xml/ofopxmlhelper \
+    comphelper/source/xml/xmltools \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/comphelper/Module_comphelper.mk b/comphelper/Module_comphelper.mk
index 08e3f17..1ccc457 100644
--- a/comphelper/Module_comphelper.mk
+++ b/comphelper/Module_comphelper.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Module_Module,comphelper))
 
 $(eval $(call gb_Module_add_targets,comphelper,\
     Package_inc \
-    Library_comphelp \
+    Library_comphelper \
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,comphelper,\


More information about the Libreoffice-commits mailing list