diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2012-06-12 11:26:49 +0200 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2012-06-12 12:19:21 +0200 |
| commit | 703fbc9fb41c8bbfc702445b8e045af5ca5c9ef6 (patch) | |
| tree | 58b059783082d0dfce03fccf7c59e4779fc16325 /rules/dbus.make | |
| parent | 0b0bfd1090b8f6abd4de83610f11cbc1f8828b09 (diff) | |
| download | ptxdist-703fbc9fb41c8bbfc702445b8e045af5ca5c9ef6.tar.gz ptxdist-703fbc9fb41c8bbfc702445b8e045af5ca5c9ef6.tar.xz | |
dbus: cleanup rules
Use more endis etc.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'rules/dbus.make')
| -rw-r--r-- | rules/dbus.make | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/rules/dbus.make b/rules/dbus.make index ef3954a93..2b89203d7 100644 --- a/rules/dbus.make +++ b/rules/dbus.make @@ -45,6 +45,9 @@ DBUS_ENV := $(CROSS_ENV) # # autoconf # +DBUS_XML-$(PTXCONF_DBUS_XML_EXPAT)=expat +DBUS_XML-$(PTXCONF_DBUS_XML_LIBXML2)=libxml + DBUS_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ --enable-silent-rules \ @@ -65,20 +68,10 @@ DBUS_AUTOCONF := \ --disable-kqueue \ --disable-console-owner-file \ --disable-userdb-cache \ - --with-dbus-user=$(PTXCONF_DBUS_USER) - -ifdef PTXCONF_DBUS_XML_EXPAT -DBUS_AUTOCONF += --with-xml=expat -endif -ifdef PTXCONF_DBUS_XML_LIBXML2 -DBUS_AUTOCONF += --with-xml=libxml -endif - -ifdef PTXCONF_DBUS_SELINUX -DBUS_AUTOCONF += --enable-selinux -else -DBUS_AUTOCONF += --disable-selinux -endif + --with-dbus-user=$(PTXCONF_DBUS_USER) \ + --$(call ptx/endis, PTXCONF_DBUS_SELINUX)-selinux \ + --with-xml=$(DBUS_XML-y) \ + --with-systemdsystemunitdir=/lib/systemd/system ifdef PTXCONF_DBUS_X DBUS_AUTOCONF += --with-x=$(SYSROOT)/usr @@ -86,12 +79,6 @@ else DBUS_AUTOCONF += --without-x endif -ifdef PTXCONF_DBUS_SYSTEMD_UNIT -DBUS_AUTOCONF += --with-systemdsystemunitdir=/lib/systemd/system -else -DBUS_AUTOCONF += --without-systemdsystemunitdir -endif - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- |