diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-10-05 21:17:25 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-05 21:19:58 +0200 |
| commit | 2b7536a99839543cc535c1c60a019bd2f784a847 (patch) | |
| tree | 79489e9a2ec32a76ec9d0c7fc8a393862419b813 /libcdr | |
| parent | 51852f04d1971b7f41cee9dbed14d1aa9e05e25f (diff) | |
gbuild: add gb_ExternalProject_use_external:
Or rather, re-purpose that for consistency (and rename original to
gb_ExternalProject_use_external_project), to abstract over the
system/internal status of dependencies of external projects.
Use it in libcdr and replace exisiting uses in apache-commons.
Change-Id: Ie144600688fa884b5b6faa986c6b95bdfc1ee15c
Diffstat (limited to 'libcdr')
| -rw-r--r-- | libcdr/ExternalProject_libcdr.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index 95d0eeb6e48f..fe6ce5f6898e 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -16,7 +16,8 @@ $(eval $(call gb_ExternalProject_register_targets,libcdr,\ )) $(eval $(call gb_ExternalProject_use_externals,cdrlib,\ - libwpd \ + wpd \ + wpg \ )) ifeq ($(OS)$(COM),WNTMSC) @@ -45,8 +46,6 @@ else # !SYSTEM_LIBWPD libcdr_cflags += -I$(OUTDIR)/inc/external libcdr_libs += $(SOLARLIB) -$(eval $(call gb_ExternalProject_use_package,libcdr,libwpd)) - endif # SYSTEM_LIBWPD @@ -60,9 +59,6 @@ else # !SYSTEM_LIBWPG libcdr_cflags += -I$(OUTDIR)/inc/external libcdr_libs += $(SOLARLIB) -$(eval $(call gb_ExternalProject_use_package,libcdr,libwpg_inc)) -$(eval $(call gb_ExternalProject_use_static_libraries,libcdr,wpglib)) - endif # SYSTEM_LIBWPG |