sd/Library_sd.mk | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
New commits: commit 9f161a847a5fefbb400f6dd5b257fba56b0cadcc Author: Tor Lillqvist <[email protected]> Date: Thu Jul 25 19:46:57 2013 +0300 Avoid duplication, use if function instead of ifeq Change-Id: I1ea52a43278f2e9971987037e80842f8c55a8782 diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index f74514b..21a4ab8 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -95,12 +95,13 @@ $(eval $(call gb_Library_use_libraries,sd,\ )) ifeq ($(OS), LINUX) -ifeq ($(ENABLE_AVAHI),TRUE) $(eval $(call gb_Library_use_externals,sd,\ boost_headers \ libxml2 \ dbus \ - avahi \ + $(if $(ENABLE_AVAHI), \ + avahi \ + ) \ )) else $(eval $(call gb_Library_use_externals,sd,\ @@ -109,13 +110,6 @@ $(eval $(call gb_Library_use_externals,sd,\ dbus \ )) endif -else -$(eval $(call gb_Library_use_externals,sd,\ - boost_headers \ - libxml2 \ - dbus \ -)) -endif ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,sd,\ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
