diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-07-25 21:24:23 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-07-25 21:26:37 +0300 |
| commit | c852fa1121d652ab74ba692c7ba0fb2b9ced5333 (patch) | |
| tree | 7bfd2f768f59d0d63c70622dbabcfc1aba4f2004 /sd | |
| parent | 4acf41db11a1791c3705712f8a66a1e85094f83d (diff) | |
Simplify and fix Avahi conditionals
Change-Id: Ied30c619804239044b935382d580dcb86bfb8b11
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/CppunitTest_sd_uimpress.mk | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index af4b82155b35..f17a2d784227 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -71,28 +71,14 @@ $(eval $(call gb_CppunitTest_use_system_darwin_frameworks,sd_uimpress,\ )) endif -ifeq ($(OS), LINUX) -ifeq ($(ENABLE_AVAHI),TRUE) -$(eval $(call gb_Library_use_externals,sd,\ - boost_headers \ - gtk \ - dbus \ - avahi \ -)) -else -$(eval $(call gb_Library_use_externals,sd,\ +$(eval $(call gb_CppunitTest_use_externals,sd_uimpress,\ boost_headers \ gtk \ dbus \ + $(if $(ENABLE_AVAHI), \ + avahi \ + ) \ )) -endif -else -$(eval $(call gb_CppunitTest_use_externals,sd_uimpress,\ - boost_headers \ - gtk \ - dbus \ -)) -endif $(eval $(call gb_CppunitTest_add_exception_objects,sd_uimpress,\ sd/qa/unit/uimpress \ |