libcdr/ExternalProject_libcdr.mk | 6 +++---
solenv/gbuild/ExternalProject.mk | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 52304f30839eb3091304bb0d7b697b6cedda71ea
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Oct 5 18:02:33 2012 +0200
libcdr: argh i am getting senile
Change-Id: I1674da35bf1d756bda5c4b991cc586462325c838
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index 719b752..95d0eeb 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 41d86ad..b604d7f 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
