diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-10-05 18:02:33 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-05 18:06:39 +0200 |
| commit | 52304f30839eb3091304bb0d7b697b6cedda71ea (patch) | |
| tree | 2b8d0f2360b15a941df9b05879e88a8f235a63ce | |
| parent | 1a9740671cfe0f324135276fe42bd18f29dcda7d (diff) | |
libcdr: argh i am getting senile
Change-Id: I1674da35bf1d756bda5c4b991cc586462325c838
| -rw-r--r-- | libcdr/ExternalProject_libcdr.mk | 6 | ||||
| -rw-r--r-- | solenv/gbuild/ExternalProject.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index 719b75295fcd..95d0eeb6e48f 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -45,7 +45,7 @@ else # !SYSTEM_LIBWPD libcdr_cflags += -I$(OUTDIR)/inc/external libcdr_libs += $(SOLARLIB) -$(eval $(call gb_ExternalProject_use_package,libwpd)) +$(eval $(call gb_ExternalProject_use_package,libcdr,libwpd)) endif # SYSTEM_LIBWPD @@ -60,8 +60,8 @@ 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)) +$(eval $(call gb_ExternalProject_use_package,libcdr,libwpg_inc)) +$(eval $(call gb_ExternalProject_use_static_libraries,libcdr,wpglib)) endif # SYSTEM_LIBWPG diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk index 41d86ade2265..b604d7f0eb14 100644 --- a/solenv/gbuild/ExternalProject.mk +++ b/solenv/gbuild/ExternalProject.mk @@ -126,7 +126,7 @@ 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)) : \ +$(foreach lib,$(2),$(call gb_ExternalProject_get_preparation_target,$(1)) : \ $(call gb_StaticLibrary_get_target,$(lib))) endef |