From f8afd6e28232a02eace0fda3a34b4edc8dc667fe Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Fri, 21 Sep 2012 16:53:52 +0200
Subject: update ext. projects to use ExternalPackage

Change-Id: Ia66854f21446fff9a04b1708964286c566333ab0
---
 libmspub/ExternalPackage_libmspub.mk | 18 ++++++++++++++++++
 libmspub/Module_libmspub.mk          |  2 +-
 libmspub/Package_libmspub.mk         | 20 --------------------
 3 files changed, 19 insertions(+), 21 deletions(-)
 create mode 100644 libmspub/ExternalPackage_libmspub.mk
 delete mode 100644 libmspub/Package_libmspub.mk

(limited to 'libmspub')

diff --git a/libmspub/ExternalPackage_libmspub.mk b/libmspub/ExternalPackage_libmspub.mk
new file mode 100644
index 000000000000..2b834cf3a062
--- /dev/null
+++ b/libmspub/ExternalPackage_libmspub.mk
@@ -0,0 +1,18 @@
+# -*- 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_ExternalPackage_ExternalPackage,libmspub_inc,mspub))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,libmspub_inc,inc/external/libmspub,\
+	libmspub.h \
+	MSPUBDocument.h \
+	MSPUBStringVector.h \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libmspub/Module_libmspub.mk b/libmspub/Module_libmspub.mk
index d81abdd60f29..0106a9f27f71 100644
--- a/libmspub/Module_libmspub.mk
+++ b/libmspub/Module_libmspub.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libmspub))
 ifeq ($(SYSTEM_LIBMSPUB),NO)
 
 $(eval $(call gb_Module_add_targets,libmspub,\
-	Package_libmspub \
+	ExternalPackage_libmspub \
 	StaticLibrary_mspub \
 	UnpackedTarball_mspub \
 ))
diff --git a/libmspub/Package_libmspub.mk b/libmspub/Package_libmspub.mk
deleted file mode 100644
index af25dc129c74..000000000000
--- a/libmspub/Package_libmspub.mk
+++ /dev/null
@@ -1,20 +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_Package_Package,libmspub_inc,$(call gb_UnpackedTarball_get_dir,mspub/src/lib)))
-
-$(eval $(call gb_Package_use_unpacked,libmspub_inc,mspub))
-
-$(eval $(call gb_Package_add_files,libmspub_inc,inc/external/libmspub,\
-	libmspub.h \
-	MSPUBDocument.h \
-	MSPUBStringVector.h \
-))
-
-# vim: set noet sw=4 ts=4:
-- 
cgit