[Libreoffice-commits] .: libwpd/ExternalProject_libwpd.mk libwpd/Module_libwpd.mk libwpd/StaticLibrary_wpd.mk

[Libreoffice Gerrit user]

 libwpd/ExternalProject_libwpd.mk |   43 +++++++++++++++++++++++++++++++++++++++
 libwpd/Module_libwpd.mk          |    2 -
 libwpd/StaticLibrary_wpd.mk      |   43 ---------------------------------------
 3 files changed, 44 insertions(+), 44 deletions(-)

New commits:
commit bc63efc586c1a3b9ba5af7087093174b0d6aeb97
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Sep 24 22:18:20 2012 +0200

    Trying to consolidate the libwpd module
    
    Change-Id: I3ce8cd24eee7f2256f2a4b1d1220562a84bf5fac

diff --git a/libwpd/ExternalProject_libwpd.mk b/libwpd/ExternalProject_libwpd.mk
new file mode 100644
index 0000000..16ddad5
--- /dev/null
+++ b/libwpd/ExternalProject_libwpd.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalProject_ExternalProject,libwpd))
+
+$(eval $(call gb_ExternalProject_use_unpacked,libwpd,wpd))
+
+$(eval $(call gb_ExternalProject_register_targets,libwpd,\
+	build \
+))
+
+ifeq ($(OS)$(COM),WNTMSC)
+
+$(call gb_ExternalProject_get_state_target,libwpd,build) :
+	cd $(EXTERNAL_WORKDIR)/build/win32 \
+	&& $(COMPATH)/vcpackages/vcbuild.exe libwpd.vcproj "Release|Win32" \
+	&& touch $@
+
+else
+
+$(call gb_ExternalProject_get_state_target,libwpd,build) :
+	cd $(EXTERNAL_WORKDIR) \
+	&& ./configure \
+		--with-pic \
+		--enable-static \
+		--disable-shared \
+		--without-stream \
+		--without-docs \
+		--disable-debug \
+		$(if $(filter MACOSX,$(OS)),--disable-werror) \
+		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+	&& $(GNUMAKE) -j$(EXTMAXPROCESS) \
+	&& touch $@
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwpd/Module_libwpd.mk b/libwpd/Module_libwpd.mk
index 74ff85e..bd74b12 100644
--- a/libwpd/Module_libwpd.mk
+++ b/libwpd/Module_libwpd.mk
@@ -12,8 +12,8 @@ $(eval $(call gb_Module_Module,libwpd))
 ifeq ($(SYSTEM_LIBWPD),NO)
 
 $(eval $(call gb_Module_add_targets,libwpd,\
+	ExternalProject_libwpd \
 	ExternalPackage_libwpd \
-	StaticLibrary_wpd \
 	UnpackedTarball_wpd \
 ))
 
diff --git a/libwpd/StaticLibrary_wpd.mk b/libwpd/StaticLibrary_wpd.mk
deleted file mode 100644
index adecdd3..0000000
--- a/libwpd/StaticLibrary_wpd.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,libwpd))
-
-$(eval $(call gb_ExternalProject_use_unpacked,libwpd,wpd))
-
-$(eval $(call gb_ExternalProject_register_targets,libwpd,\
-	build \
-))
-
-ifeq ($(OS)$(COM),WNTMSC)
-
-$(call gb_ExternalProject_get_state_target,libwpd,build) :
-	cd $(EXTERNAL_WORKDIR)/build/win32 \
-	&& $(COMPATH)/vcpackages/vcbuild.exe libwpd.vcproj "Release|Win32" \
-	&& touch $@
-
-else
-
-$(call gb_ExternalProject_get_state_target,libwpd,build) :
-	cd $(EXTERNAL_WORKDIR) \
-	&& ./configure \
-		--with-pic \
-		--enable-static \
-		--disable-shared \
-		--without-stream \
-		--without-docs \
-		--disable-debug \
-		$(if $(filter MACOSX,$(OS)),--disable-werror) \
-		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-	&& $(GNUMAKE) \
-	&& touch $@
-
-endif
-
-# vim: set noet sw=4 ts=4: