diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-10-05 17:48:45 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-05 17:48:45 +0200 |
| commit | 1a9740671cfe0f324135276fe42bd18f29dcda7d (patch) | |
| tree | a2fce290b6522bf1a5763894525c18e83089df09 | |
| parent | ff12d3033b9284a779ea32f7cbf20d840b1995f2 (diff) | |
libcdr: hopefully get this to build
unfortunately the ExternalProject uses a StaticLibrary built in libwpg.
Change-Id: Ie4a8933247edbd2d53f697432a0848a05216237f
| -rw-r--r-- | libcdr/ExternalProject_libcdr.mk | 12 | ||||
| -rw-r--r-- | solenv/gbuild/ExternalProject.mk | 7 |
2 files changed, 14 insertions, 5 deletions
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index de48baed3a8f..719b75295fcd 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -16,11 +16,8 @@ $(eval $(call gb_ExternalProject_register_targets,libcdr,\ )) $(eval $(call gb_ExternalProject_use_externals,cdrlib,\ - lcms2 \ - wpd \ - wpg \ - zlib \ -)) + libwpd \ +)) ifeq ($(OS)$(COM),WNTMSC) @@ -48,6 +45,8 @@ else # !SYSTEM_LIBWPD libcdr_cflags += -I$(OUTDIR)/inc/external libcdr_libs += $(SOLARLIB) +$(eval $(call gb_ExternalProject_use_package,libwpd)) + endif # SYSTEM_LIBWPD @@ -61,6 +60,9 @@ else # !SYSTEM_LIBWPG libcdr_cflags += -I$(OUTDIR)/inc/external libcdr_libs += $(SOLARLIB) +$(eval $(call gb_ExternalProject_use_package,libwpg_inc)) +$(eval $(call gb_ExternalProject_use_static_libraries,wpglib)) + endif # SYSTEM_LIBWPG diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk index 9ed1db74903f..41d86ade2265 100644 --- a/solenv/gbuild/ExternalProject.mk +++ b/solenv/gbuild/ExternalProject.mk @@ -124,6 +124,13 @@ $(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_Package_get_t endef +# TODO: do we really want to have projects depending on gbuild libraries? +define gb_ExternalProject_use_static_libraries +$(foreach $(lib),$(2),$(call gb_ExternalProject_get_preparation_target,$(1)) : \ + $(call gb_StaticLibrary_get_target,$(lib))) + +endef + # Make an external project depend on several packages at once # # gb_ExternalProject_use_packages external package(s) |