[Libreoffice-commits] .: cppuhelper/CppunitTest_cppuhelper_checkapi.mk cppuhelper/CustomTarget_cppuhelper_allheaders.mk

[Lubos Lunak]

 cppuhelper/CppunitTest_cppuhelper_checkapi.mk    |   24 +++++++++++------------
 cppuhelper/CustomTarget_cppuhelper_allheaders.mk |   22 ++++++++++-----------
 2 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit 437dc5384985c97d6b59e91ab5280a840a387731
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Mon Jul 16 17:58:58 2012 +0200

    forgot to rename cppu -> cppuhelper from the template
    
    Change-Id: I6a2ba2213d59ba73f7f170f40c7607f6ad23a0f4

diff --git a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk
index 98832d0..60a66b6 100644
--- a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk
@@ -25,30 +25,30 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_CppunitTest_CppunitTest,cppu_checkapi))
+$(eval $(call gb_CppunitTest_CppunitTest,cppuhelper_checkapi))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,cppu_checkapi,\
-    cppu/qa/checkapi/strings \
+$(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_checkapi,\
+    cppuhelper/qa/checkapi/strings \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,cppu_checkapi,\
+$(eval $(call gb_CppunitTest_set_include,cppuhelper_checkapi,\
 	$$(INCLUDE) \
-	-I$(SRCDIR)/cppu/inc \
+	-I$(SRCDIR)/cppuhelper/inc \
 ))
 
-$(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_checkapi, \
+$(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppuhelper_checkapi, \
 	cppu \
 	udkapi \
 ))
 
 # strings.cxx includes generated strings.hxx
-$(call gb_CxxObject_get_target,cppu/qa/checkapi/strings) : \
-	INCLUDE += -I$(call gb_CustomTarget_get_workdir,cppu/allheaders)
-$(call gb_CxxObject_get_target,cppu/qa/checkapi/strings) :| \
-	$(call gb_CustomTarget_get_workdir,cppu/allheaders)/cppu_allheaders.hxx
+$(call gb_CxxObject_get_target,cppuhelper/qa/checkapi/strings) : \
+	INCLUDE += -I$(call gb_CustomTarget_get_workdir,cppuhelper/allheaders)
+$(call gb_CxxObject_get_target,cppuhelper/qa/checkapi/strings) :| \
+	$(call gb_CustomTarget_get_workdir,cppuhelper/allheaders)/cppuhelper_allheaders.hxx
 
-$(eval $(call gb_CppunitTest_use_libraries,cppu_checkapi,\
-    cppu \
+$(eval $(call gb_CppunitTest_use_libraries,cppuhelper_checkapi,\
+    cppuhelper \
     $(gb_STDLIBS) \
 ))
 
diff --git a/cppuhelper/CustomTarget_cppuhelper_allheaders.mk b/cppuhelper/CustomTarget_cppuhelper_allheaders.mk
index 9097ae4..24d80c3 100644
--- a/cppuhelper/CustomTarget_cppuhelper_allheaders.mk
+++ b/cppuhelper/CustomTarget_cppuhelper_allheaders.mk
@@ -25,24 +25,24 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_CustomTarget_CustomTarget,cppu/allheaders))
+$(eval $(call gb_CustomTarget_CustomTarget,cppuhelper/allheaders))
 
-cppu_allheaders_DIR := $(call gb_CustomTarget_get_workdir,cppu/allheaders)
+cppuhelper_allheaders_DIR := $(call gb_CustomTarget_get_workdir,cppuhelper/allheaders)
 
-$(call gb_CustomTarget_get_target,cppu/allheaders) : \
-	$(cppu_allheaders_DIR)/cppu_allheaders.hxx
+$(call gb_CustomTarget_get_target,cppuhelper/allheaders) : \
+	$(cppuhelper_allheaders_DIR)/cppuhelper_allheaders.hxx
 
 # dependency on Package_inc.mk should ensure this is updated whenever a new public header is added
-$(cppu_allheaders_DIR)/cppu_allheaders.hxx :| $(cppu_allheaders_DIR)/.dir $(SRCDIR)/cppu/Package_inc.mk
+$(cppuhelper_allheaders_DIR)/cppuhelper_allheaders.hxx :| $(cppuhelper_allheaders_DIR)/.dir $(SRCDIR)/cppuhelper/Package_inc.mk
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
-	echo '// Generated list of all cppu/ includes' >  $@
+	echo '// Generated list of all cppuhelper/ includes' >  $@
 	echo -e  \
-	    $(foreach file, $(wildcard $(SRCDIR)/cppu/inc/*.h) $(wildcard $(SRCDIR)/cppu/inc/*.hxx) \
-	                    $(wildcard $(SRCDIR)/cppu/inc/*/*.h) $(wildcard $(SRCDIR)/cppu/inc/*/*.hxx) \
-	                    $(wildcard $(SRCDIR)/cppu/inc/*/*/*.h) $(wildcard $(SRCDIR)/cppu/inc/*/*/*.hxx) \
-	                    $(wildcard $(SRCDIR)/cppu/inc/*/*/*/*.h) $(wildcard $(SRCDIR)/cppu/inc/*/*/*/*.hxx), \
+	    $(foreach file, $(wildcard $(SRCDIR)/cppuhelper/inc/*.h) $(wildcard $(SRCDIR)/cppuhelper/inc/*.hxx) \
+	                    $(wildcard $(SRCDIR)/cppuhelper/inc/*/*.h) $(wildcard $(SRCDIR)/cppuhelper/inc/*/*.hxx) \
+	                    $(wildcard $(SRCDIR)/cppuhelper/inc/*/*/*.h) $(wildcard $(SRCDIR)/cppuhelper/inc/*/*/*.hxx) \
+	                    $(wildcard $(SRCDIR)/cppuhelper/inc/*/*/*/*.h) $(wildcard $(SRCDIR)/cppuhelper/inc/*/*/*/*.hxx), \
 	        $(if $(findstring /win32/, $(file)), '#ifdef _WIN32\n') \
-	        '#include <$(subst $(SRCDIR)/cppu/inc/,,$(file))>\n' \
+	        '#include <$(subst $(SRCDIR)/cppuhelper/inc/,,$(file))>\n' \
 	        $(if $(findstring /win32/, $(file)), '#endif // _WIN32\n') \
 	    ) >> $@