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
---
 libwpg/ExternalPackage_libwpg.mk | 18 ++++++++++++++++++
 libwpg/Module_libwpg.mk          |  2 +-
 libwpg/Package_libwpg.mk         | 20 --------------------
 3 files changed, 19 insertions(+), 21 deletions(-)
 create mode 100644 libwpg/ExternalPackage_libwpg.mk
 delete mode 100644 libwpg/Package_libwpg.mk

(limited to 'libwpg')

diff --git a/libwpg/ExternalPackage_libwpg.mk b/libwpg/ExternalPackage_libwpg.mk
new file mode 100644
index 000000000000..34cd932fcd62
--- /dev/null
+++ b/libwpg/ExternalPackage_libwpg.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,libwpg_inc,wpg))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpg_inc,inc/external/libwpg,\
+	libwpg.h \
+	WPGPaintInterface.h \
+	WPGraphics.h \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwpg/Module_libwpg.mk b/libwpg/Module_libwpg.mk
index 9e271dc08511..e628b89cda8c 100644
--- a/libwpg/Module_libwpg.mk
+++ b/libwpg/Module_libwpg.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libwpg))
 ifeq ($(SYSTEM_LIBWPG),NO)
 
 $(eval $(call gb_Module_add_targets,libwpg,\
-	Package_libwpg \
+	ExternalPackage_libwpg \
 	StaticLibrary_wpg \
 	UnpackedTarball_wpg \
 ))
diff --git a/libwpg/Package_libwpg.mk b/libwpg/Package_libwpg.mk
deleted file mode 100644
index 6a1f6a4a3b99..000000000000
--- a/libwpg/Package_libwpg.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,libwpg_inc,$(call gb_UnpackedTarball_get_dir,wpg/src/lib)))
-
-$(eval $(call gb_Package_use_unpacked,libwpg_inc,wpg))
-
-$(eval $(call gb_Package_add_files,libwpg_inc,inc/external/libwpg,\
-	libwpg.h \
-	WPGPaintInterface.h \
-	WPGraphics.h \
-))
-
-# vim: set noet sw=4 ts=4:
-- 
cgit v1.2.3