summaryrefslogtreecommitdiff
path: root/cppu
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-04-07 01:17:07 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2012-04-09 21:04:37 +0200
commit9e7d5cd530365450a404cc26716890ecdc4281b6 (patch)
tree03578814d85772bf34c7c73057bcb982d6918a63 /cppu
parentbd988a23a17dff20c8ee136750e32e16531080d8 (diff)
cppu: use InternalUnoApi
Diffstat (limited to 'cppu')
-rw-r--r--cppu/CppunitTest_cppu_qa_any.mk7
-rw-r--r--cppu/CppunitTest_cppu_qa_recursion.mk7
-rw-r--r--cppu/CppunitTest_cppu_qa_reference.mk7
-rw-r--r--cppu/CppunitTest_cppu_qa_unotype.mk7
-rw-r--r--cppu/CppunitTest_cppu_test_cppumaker.mk7
-rw-r--r--cppu/InternalUnoApi_cppu.mk (renamed from cppu/Package_generated.mk)30
-rw-r--r--cppu/Library_affine_uno.mk5
-rw-r--r--cppu/Library_cppu.mk8
-rw-r--r--cppu/Library_log_uno.mk5
-rw-r--r--cppu/Library_purpenvhelper.mk5
-rw-r--r--cppu/Library_unsafe_uno.mk5
-rw-r--r--cppu/Module_cppu.mk2
-rw-r--r--cppu/qa/Makefile48
13 files changed, 36 insertions, 107 deletions
diff --git a/cppu/CppunitTest_cppu_qa_any.mk b/cppu/CppunitTest_cppu_qa_any.mk
index 6263e7dae0c6..200abe92a144 100644
--- a/cppu/CppunitTest_cppu_qa_any.mk
+++ b/cppu/CppunitTest_cppu_qa_any.mk
@@ -37,10 +37,9 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_any, \
$(gb_STDLIBS) \
))
-$(eval $(call gb_CppunitTest_set_include,cppu_qa_any,\
- -I$(WORKDIR)/CustomTarget/cppu/qa \
- -I$(SRCDIR)/cppu/inc \
- $$(INCLUDE) \
+$(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_any, \
+ cppu \
+ udkapi \
))
# vim: set noet sw=4 ts=4:
diff --git a/cppu/CppunitTest_cppu_qa_recursion.mk b/cppu/CppunitTest_cppu_qa_recursion.mk
index 1534e382ea37..9ff9af3c9bd6 100644
--- a/cppu/CppunitTest_cppu_qa_recursion.mk
+++ b/cppu/CppunitTest_cppu_qa_recursion.mk
@@ -37,10 +37,9 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_recursion, \
$(gb_STDLIBS) \
))
-$(eval $(call gb_CppunitTest_set_include,cppu_qa_recursion,\
- -I$(WORKDIR)/CustomTarget/cppu/qa \
- -I$(SRCDIR)/cppu/inc \
- $$(INCLUDE) \
+$(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_recursion, \
+ cppu \
+ udkapi \
))
# vim: set noet sw=4 ts=4:
diff --git a/cppu/CppunitTest_cppu_qa_reference.mk b/cppu/CppunitTest_cppu_qa_reference.mk
index 1dc96fe813fe..a49d546d61c8 100644
--- a/cppu/CppunitTest_cppu_qa_reference.mk
+++ b/cppu/CppunitTest_cppu_qa_reference.mk
@@ -37,10 +37,9 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_reference, \
$(gb_STDLIBS) \
))
-$(eval $(call gb_CppunitTest_set_include,cppu_qa_reference,\
- -I$(WORKDIR)/CustomTarget/cppu/qa \
- -I$(SRCDIR)/cppu/inc \
- $$(INCLUDE) \
+$(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_reference, \
+ cppu \
+ udkapi \
))
# vim: set noet sw=4 ts=4:
diff --git a/cppu/CppunitTest_cppu_qa_unotype.mk b/cppu/CppunitTest_cppu_qa_unotype.mk
index bb1ac9155800..9e4619c1aac0 100644
--- a/cppu/CppunitTest_cppu_qa_unotype.mk
+++ b/cppu/CppunitTest_cppu_qa_unotype.mk
@@ -37,10 +37,9 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_unotype, \
$(gb_STDLIBS) \
))
-$(eval $(call gb_CppunitTest_set_include,cppu_qa_unotype,\
- -I$(WORKDIR)/CustomTarget/cppu/qa \
- -I$(SRCDIR)/cppu/inc \
- $$(INCLUDE) \
+$(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_unotype, \
+ cppu \
+ udkapi \
))
# vim: set noet sw=4 ts=4:
diff --git a/cppu/CppunitTest_cppu_test_cppumaker.mk b/cppu/CppunitTest_cppu_test_cppumaker.mk
index 0c495c03a01c..a3bb717dbdee 100644
--- a/cppu/CppunitTest_cppu_test_cppumaker.mk
+++ b/cppu/CppunitTest_cppu_test_cppumaker.mk
@@ -37,10 +37,9 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_test_cppumaker, \
$(gb_STDLIBS) \
))
-$(eval $(call gb_CppunitTest_set_include,cppu_test_cppumaker,\
- -I$(WORKDIR)/CustomTarget/cppu/qa \
- -I$(SRCDIR)/cppu/inc \
- $$(INCLUDE) \
+$(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_test_cppumaker, \
+ cppu \
+ udkapi \
))
# vim: set noet sw=4 ts=4:
diff --git a/cppu/Package_generated.mk b/cppu/InternalUnoApi_cppu.mk
index 027219258a5f..b60e2b76fc11 100644
--- a/cppu/Package_generated.mk
+++ b/cppu/InternalUnoApi_cppu.mk
@@ -1,5 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -13,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
@@ -25,15 +25,23 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_Package_Package,cppu_generated))
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,cppu))
+
+$(eval $(call gb_InternalUnoApi_use_api,cppu,\
+ udkapi \
+))
+
+$(eval $(call gb_InternalUnoApi_set_include,cppu,\
+ -I$(OUTDIR)/idl \
+ $$(INCLUDE) \
+))
-$(eval $(call gb_Package_add_customtarget,cppu_generated,cppu/qa))
+$(eval $(call gb_InternalUnoApi_add_idlfiles,cppu,cppu/qa,\
+ types \
+))
-$(eval $(call gb_CustomTarget_add_outdir_dependencies,cppu/qa,\
- $(gb_UnoApiTarget_CPPUMAKERTARGET) \
- $(gb_UnoApiTarget_IDLCTARGET) \
- $(gb_UnoApiTarget_REGMERGETARGET) \
- $(OUTDIR_FOR_BUILD)/bin/udkapi.rdb \
+$(eval $(call gb_InternalUnoApi_add_idlfiles,cppu,cppu/qa/cppumaker,\
+ types \
))
-# vim: set noet sw=4 ts=4:
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cppu/Library_affine_uno.mk b/cppu/Library_affine_uno.mk
index 33182712e4a1..b4ab2fddfa68 100644
--- a/cppu/Library_affine_uno.mk
+++ b/cppu/Library_affine_uno.mk
@@ -27,11 +27,6 @@
$(eval $(call gb_Library_Library,affine_uno))
-$(eval $(call gb_Library_set_include,affine_uno,\
- $$(INCLUDE) \
- -I$(SRCDIR)/cppu/inc \
-))
-
$(eval $(call gb_Library_use_api,affine_uno,\
udkapi \
offapi \
diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk
index 9dcb35a6af31..78eae8f817ef 100644
--- a/cppu/Library_cppu.mk
+++ b/cppu/Library_cppu.mk
@@ -29,13 +29,7 @@ $(eval $(call gb_Library_Library,cppu))
$(eval $(call gb_Library_set_soversion_script,cppu,3,$(SRCDIR)/cppu/util/cppu.map))
-# Unit tests depend on cppu_generated custom target
-$(eval $(call gb_Library_use_package,cppu,cppu_generated))
-
-$(eval $(call gb_Library_set_include,cppu,\
- $$(INCLUDE) \
- -I$(SRCDIR)/cppu/inc \
-))
+$(eval $(call gb_Library_use_package,cppu,cppu_inc))
$(eval $(call gb_Library_use_api,cppu,\
udkapi \
diff --git a/cppu/Library_log_uno.mk b/cppu/Library_log_uno.mk
index 582414d381d1..7e371e934555 100644
--- a/cppu/Library_log_uno.mk
+++ b/cppu/Library_log_uno.mk
@@ -27,11 +27,6 @@
$(eval $(call gb_Library_Library,log_uno))
-$(eval $(call gb_Library_set_include,log_uno,\
- $$(INCLUDE) \
- -I$(SRCDIR)/cppu/inc \
-))
-
$(eval $(call gb_Library_use_api,log_uno,\
udkapi \
offapi \
diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk
index 60d04850a270..1deaca40b2bc 100644
--- a/cppu/Library_purpenvhelper.mk
+++ b/cppu/Library_purpenvhelper.mk
@@ -29,11 +29,6 @@ $(eval $(call gb_Library_Library,purpenvhelper))
$(eval $(call gb_Library_set_soversion_script,purpenvhelper,3,$(SRCDIR)/cppu/util/uno_purpenvhelpergcc3.map))
-$(eval $(call gb_Library_set_include,purpenvhelper,\
- $$(INCLUDE) \
- -I$(SRCDIR)/cppu/inc \
-))
-
$(eval $(call gb_Library_add_defs,purpenvhelper,\
-DPURPENV_DLLIMPLEMENTATION \
))
diff --git a/cppu/Library_unsafe_uno.mk b/cppu/Library_unsafe_uno.mk
index 49724f5377dd..bd680c0b35cb 100644
--- a/cppu/Library_unsafe_uno.mk
+++ b/cppu/Library_unsafe_uno.mk
@@ -27,11 +27,6 @@
$(eval $(call gb_Library_Library,unsafe_uno))
-$(eval $(call gb_Library_set_include,unsafe_uno,\
- $$(INCLUDE) \
- -I$(SRCDIR)/cppu/inc \
-))
-
$(eval $(call gb_Library_use_api,unsafe_uno,\
udkapi \
offapi \
diff --git a/cppu/Module_cppu.mk b/cppu/Module_cppu.mk
index e4e12d09ba31..c34117b0b5eb 100644
--- a/cppu/Module_cppu.mk
+++ b/cppu/Module_cppu.mk
@@ -28,12 +28,12 @@
$(eval $(call gb_Module_Module,cppu))
$(eval $(call gb_Module_add_targets,cppu,\
+ InternalUnoApi_cppu \
Library_affine_uno \
Library_cppu \
Library_log_uno \
Library_purpenvhelper \
Library_unsafe_uno \
- Package_generated \
Package_inc \
))
diff --git a/cppu/qa/Makefile b/cppu/qa/Makefile
deleted file mode 100644
index a68567d66415..000000000000
--- a/cppu/qa/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-gb_PARTIALBUILD:=T
-include $(GBUILDDIR)/gbuild.mk
-
-all: qa/cppumaker.flag qa/cppumaker/cppumaker.flag
-
-%/cppumaker.flag: %/cppumaker.rdb $(gb_UnoApiTarget_CPPUMAKERTARGET)
- $(call gb_Helper_abbreviate_dirs_native, \
- $(call gb_Helper_execute,cppumaker) -O. -BUCR -C $< $(OUTDIR_FOR_BUILD)/bin/udkapi.rdb)
- touch $@
-
-%/cppumaker.rdb: %/types.urd
- $(call gb_Helper_abbreviate_dirs_native, \
- $(call gb_Helper_execute,regmerge) $@ /UCR $<)
-
-%/types.urd: $(SRCDIR)/cppu/%/types.idl
- $(call gb_Helper_abbreviate_dirs_native, \
- $(call gb_Helper_execute,idlc) -O$* -I$(OUTDIR_FOR_BUILD)/idl -cid -we $<)
-
-.DEFAULT_GOAL:=all
-.PHONY: all
-# vim: set noet sw=4 ts=4: