diff options
Diffstat (limited to 'libvisio')
| -rw-r--r-- | libvisio/ExternalPackage_libvisio.mk (renamed from libvisio/Package_libvisio.mk) | 12 | ||||
| -rw-r--r-- | libvisio/Module_libvisio.mk | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/libvisio/Package_libvisio.mk b/libvisio/ExternalPackage_libvisio.mk index 54bb8f416c0c..a876f149eee1 100644 --- a/libvisio/Package_libvisio.mk +++ b/libvisio/ExternalPackage_libvisio.mk @@ -7,14 +7,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,libvisio_inc,$(call gb_UnpackedTarball_get_dir,visio/src/lib))) +$(eval $(call gb_ExternalPackage_ExternalPackage,libvisio_inc,visio)) -$(eval $(call gb_Package_use_unpacked,libvisio_inc,visio)) - -$(eval $(call gb_Package_add_files,libvisio_inc,inc/external/libvisio,\ - libvisio.h \ - VisioDocument.h \ - VSDStringVector.h \ +$(eval $(call gb_ExternalPackage_add_unpacked_files,libvisio_inc,inc/external/libvisio,\ + src/lib/libvisio.h \ + src/lib/VisioDocument.h \ + src/lib/VSDStringVector.h \ )) # vim: set noet sw=4 ts=4: diff --git a/libvisio/Module_libvisio.mk b/libvisio/Module_libvisio.mk index 6c4190d7251f..9e1309cf5701 100644 --- a/libvisio/Module_libvisio.mk +++ b/libvisio/Module_libvisio.mk @@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libvisio)) ifeq ($(SYSTEM_LIBVISIO),NO) $(eval $(call gb_Module_add_targets,libvisio,\ - Package_libvisio \ + ExternalPackage_libvisio \ StaticLibrary_visio \ UnpackedTarball_visio \ )) |