E-DBus: Decide whether to build module or not in upper level

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/e_dbus@53960 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index b99d61e..29b550f 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,3 +1,27 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = dbus bluez connman hal notification ofono ukit
+SUBDIRS = dbus
+
+if BUILD_EBLUEZ
+SUBDIRS += bluez
+endif
+
+if BUILD_ECONNMAN
+SUBDIRS += connman
+endif
+
+if BUILD_EHAL
+SUBDIRS += hal
+endif
+
+if BUILD_ENOTIFY
+SUBDIRS += notification
+endif
+
+if BUILD_EOFONO
+SUBDIRS += ofono
+endif
+
+if BUILD_EUKIT
+SUBDIRS += ukit
+endif

diff --git a/src/lib/bluez/Makefile.am b/src/lib/bluez/Makefile.am
index 0b4dac4..b2b6e87 100644 (file)
--- a/src/lib/bluez/Makefile.am
+++ b/src/lib/bluez/Makefile.am
@@ -4,8 +4,6 @@ AM_CPPFLAGS = \
 -I $(top_srcdir)/src/lib/dbus \
 @EDBUS_CFLAGS@
 
-if BUILD_EBLUEZ
-
 lib_LTLIBRARIES = libebluez.la
 includes_HEADERS = E_Bluez.h
 includesdir = $(includedir)/e_dbus-@VMAJ@
@@ -23,6 +21,4 @@ $(top_builddir)/src/lib/dbus/libedbus.la
 
 libebluez_la_LDFLAGS = -version-info @version_info@ @release_info@
 
-endif
-
 EXTRA_DIST = e_bluez_private.h

diff --git a/src/lib/connman/Makefile.am b/src/lib/connman/Makefile.am
index 732384f..6159129 100644 (file)
--- a/src/lib/connman/Makefile.am
+++ b/src/lib/connman/Makefile.am
@@ -4,8 +4,6 @@ AM_CPPFLAGS = \
 -I $(top_srcdir)/src/lib/dbus \
 @EDBUS_CFLAGS@
 
-if BUILD_ECONNMAN
-
 lib_LTLIBRARIES = libeconnman.la
 includes_HEADERS = E_Connman.h
 includesdir = $(includedir)/e_dbus-@VMAJ@
@@ -25,6 +23,4 @@ $(top_builddir)/src/lib/dbus/libedbus.la
 
 libeconnman_la_LDFLAGS = -version-info @version_info@ @release_info@
 
-endif
-
 EXTRA_DIST = e_connman_private.h

diff --git a/src/lib/hal/Makefile.am b/src/lib/hal/Makefile.am
index 1355617..f8e78cb 100644 (file)
--- a/src/lib/hal/Makefile.am
+++ b/src/lib/hal/Makefile.am
@@ -4,8 +4,6 @@ AM_CPPFLAGS = \
 -I $(top_srcdir)/src/lib/dbus \
 @EDBUS_CFLAGS@
 
-if BUILD_EHAL
-
 lib_LTLIBRARIES = libehal.la
 includes_HEADERS = E_Hal.h
 includesdir = $(includedir)/e_dbus-@VMAJ@
@@ -21,6 +19,4 @@ $(top_builddir)/src/lib/dbus/libedbus.la
 
 libehal_la_LDFLAGS = -version-info @version_info@ @release_info@
 
-endif
-
 EXTRA_DIST = e_hal_private.h

diff --git a/src/lib/notification/Makefile.am b/src/lib/notification/Makefile.am
index 7725fd2..8ee177a 100644 (file)
--- a/src/lib/notification/Makefile.am
+++ b/src/lib/notification/Makefile.am
@@ -5,8 +5,6 @@ AM_CPPFLAGS = \
 @EDBUS_CFLAGS@ \
 @EVAS_CFLAGS@
 
-if BUILD_ENOTIFY
-
 lib_LTLIBRARIES = libenotify.la
 includes_HEADERS = E_Notify.h E_Notification_Daemon.h
 includesdir = $(includedir)/e_dbus-@VMAJ@
@@ -23,6 +21,4 @@ $(top_builddir)/src/lib/dbus/libedbus.la \
 
 libenotify_la_LDFLAGS = -version-info @version_info@ @release_info@
 
-endif
-
 EXTRA_DIST = e_notify_private.h

diff --git a/src/lib/ofono/Makefile.am b/src/lib/ofono/Makefile.am
index c91c545..38947c7 100644 (file)
--- a/src/lib/ofono/Makefile.am
+++ b/src/lib/ofono/Makefile.am
@@ -4,8 +4,6 @@ AM_CPPFLAGS = \
 -I $(top_srcdir)/src/lib/dbus \
 @EDBUS_CFLAGS@
 
-if BUILD_EOFONO
-
 lib_LTLIBRARIES = libeofono.la
 includes_HEADERS = E_Ofono.h
 includesdir = $(includedir)/e_dbus-@VMAJ@
@@ -23,6 +21,4 @@ $(top_builddir)/src/lib/dbus/libedbus.la
 
 libeofono_la_LDFLAGS = -version-info @version_info@ @release_info@
 
-endif
-
 EXTRA_DIST = e_ofono_private.h