[Libreoffice-commits] .: 3 commits - libwpd/ExternalPackage_libwpd.mk RepositoryExternal.mk

[Libreoffice Gerrit user]

 RepositoryExternal.mk            |   20 +++-----------------
 libwpd/ExternalPackage_libwpd.mk |   12 +++++-------
 2 files changed, 8 insertions(+), 24 deletions(-)

New commits:
commit 342954349875ec4c22f6d2dcb9979f4f16eef92e
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Sep 24 22:25:28 2012 +0200

    RepositoryExternal: for libraries not built with gbuild,
    
    such as wpd, it is necessary to depend on the package in the "use".
    (for libraries built with gbuilt that is done automagically).
    
    Change-Id: I022b66f679fe168de77c2481e6889cddbb0aac3c

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1f22af9..05880d9 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1025,6 +1025,9 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 ))
 
 define gb_LinkTarget__use_wpd
+$(call gb_LinkTarget_use_package,$(1),\
+	libwpd \
+)
 $(call gb_LinkTarget_use_static_libraries,$(1),\
 	wpd-0.9 \
 )
commit 4b43f23ba10aa7c3751dead7c309bc065f7c78be
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Sep 24 22:24:54 2012 +0200

    libwpd: invalid to have both ExternalPackage and Package in one makefile
    
    Change-Id: Ia695c0a1fff265360bee57f9b6063178856b7f82

diff --git a/libwpd/ExternalPackage_libwpd.mk b/libwpd/ExternalPackage_libwpd.mk
index 34622fb..f2375d1 100644
--- a/libwpd/ExternalPackage_libwpd.mk
+++ b/libwpd/ExternalPackage_libwpd.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,libwpd_inc,wpd))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libwpd,wpd))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd_inc,inc/external/libwpd,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd,inc/external/libwpd,\
 	src/lib/libwpd.h \
 	src/lib/WPDocument.h \
 	src/lib/WPXBinaryData.h \
@@ -20,15 +20,13 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd_inc,inc/external/libw
 	src/lib/WPXPropertyListVector.h \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd_inc,inc/external/libwpd-stream,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd,inc/external/libwpd-stream,\
 	src/lib/libwpd-stream.h \
 	src/lib/WPXStream.h \
 	src/lib/WPXStreamImplementation.h \
 ))
 
-$(eval $(call gb_Package_Package,libwpd,$(call gb_UnpackedTarball_get_dir,wpd)))
-
-$(eval $(call gb_Package_use_external_project,libwpd,libwpd))
+$(eval $(call gb_ExternalPackage_use_external_project,libwpd,libwpd))
 
 ifeq ($(OS)$(COM),WNTMSC)
 $(eval $(call gb_ExternalPackage_add_file,libwpd,lib/wpd-0.9.lib,build/win32/Release/lib/libwpd-0.9.lib))
commit 4901a28271ad83a2af6e970e9ba170eb0004c66c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Sep 24 22:05:01 2012 +0200

    libwpd: rename library on deliver to have only one MSVC special case
    
    Change-Id: I3d0f899b5c8e8605d1cfd3a7d717da999f0f2350

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1c030fd..1f22af9 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1020,21 +1020,6 @@ endef
 
 else # !SYSTEM_LIBWPD
 
-ifeq ($(OS)$(COM),WNTMSC)
-
-$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
-	libwpd-0.9 \
-))
-
-define gb_LinkTarget__use_wpd
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-	libwpd-0.9 \
-)
-
-endef
-
-else # !WNTMSC
-
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 	wpd-0.9 \
 ))
@@ -1046,8 +1031,6 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
 
 endef
 
-endif # WNTMSC
-
 endif # SYSTEM_LIBWPD
 
 
diff --git a/libwpd/ExternalPackage_libwpd.mk b/libwpd/ExternalPackage_libwpd.mk
index 053e107..34622fb 100644
--- a/libwpd/ExternalPackage_libwpd.mk
+++ b/libwpd/ExternalPackage_libwpd.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Package_Package,libwpd,$(call gb_UnpackedTarball_get_dir,wpd)))
 $(eval $(call gb_Package_use_external_project,libwpd,libwpd))
 
 ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_ExternalPackage_add_file,libwpd,lib/libwpd-0.9.lib,build/win32/Release/lib/libwpd-0.9.lib))
+$(eval $(call gb_ExternalPackage_add_file,libwpd,lib/wpd-0.9.lib,build/win32/Release/lib/libwpd-0.9.lib))
 else
 $(eval $(call gb_ExternalPackage_add_file,libwpd,lib/libwpd-0.9.a,src/lib/.libs/libwpd-0.9.a))
 endif