[Libreoffice-commits] core.git: 2 commits - android/Module_android.mk sdext/CppunitTest_pdfimport.mk sdext/CppunitTest_sdext_pdfimport.mk sdext/Module_sdext.mk

[Matúš Kukan]

 android/Module_android.mk            |    3 +
 sdext/CppunitTest_pdfimport.mk       |   61 -----------------------------------
 sdext/CppunitTest_sdext_pdfimport.mk |   61 +++++++++++++++++++++++++++++++++++
 sdext/Module_sdext.mk                |    2 -
 4 files changed, 64 insertions(+), 63 deletions(-)

New commits:
commit 67316dd9ec0f93acf16c16e97f3e1472cfd2b8a8
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Fri Feb 7 21:50:47 2014 +0100

    Add CustomTarget_android_desktop back.
    
    Change-Id: I4bad098055c6c3b34dd5f02caf17df13cf4df797

diff --git a/android/Module_android.mk b/android/Module_android.mk
index 336f118..e860449 100644
--- a/android/Module_android.mk
+++ b/android/Module_android.mk
@@ -12,7 +12,8 @@ $(eval $(call gb_Module_Module,android))
 ifeq ($(OS),ANDROID)
 
 $(eval $(call gb_Module_add_targets,android,\
-    CustomTarget_lo4android \
+	CustomTarget_lo4android \
+	CustomTarget_android_desktop \
 ))
 
 endif
commit 0a1437b01bf27658c5dab5f1f99600cf4d57606f
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Sat Feb 8 08:57:43 2014 +0100

    Rename makefile to match the name of test.
    
    Change-Id: I00f11f644b92f18f7a139bb8ece67c57a971f17e

diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_sdext_pdfimport.mk
similarity index 100%
rename from sdext/CppunitTest_pdfimport.mk
rename to sdext/CppunitTest_sdext_pdfimport.mk
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index 5299cd8..f706e9c 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -27,7 +27,7 @@ $(eval $(call gb_Module_add_targets,sdext,\
 ))
 
 $(eval $(call gb_Module_add_check_targets,sdext,\
-    CppunitTest_pdfimport \
+    CppunitTest_sdext_pdfimport \
     Executable_pdf2xml \
     Executable_pdfunzip \
 ))