Make e_dbus depend on eina. No change in the code yet, so just fix your build system...

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

diff --git a/configure.ac b/configure.ac
index 256ef94..cb97e73 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,8 @@ AC_ARG_ENABLE(enotify,
                                  [enable_enotify="yes"])
 
 
+PKG_CHECK_MODULES([EINA], [eina-0])
+
 PKG_CHECK_MODULES([EDBUS], [
   dbus-1 >= 0.62
   ecore >= 0.9.9

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 251b2d2..a90ef48 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -5,10 +5,12 @@ EDBUS_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/hal \
 -I$(top_srcdir)/src/lib/nm \
 -I$(top_srcdir)/src/lib/notification \
-@EDBUS_CFLAGS@ 
+@EDBUS_CFLAGS@ \
+@EINA_CFLAGS@
 
 LIBS = \
-@EDBUS_LIBS@
+@EDBUS_LIBS@ \
+@EINA_LIBS@
 
 EDBUS_PROG = e_dbus_test e_dbus_test_client
 if BUILD_EHAL

diff --git a/src/lib/dbus/Makefile.am b/src/lib/dbus/Makefile.am
index ae69d41..d010eb6 100644 (file)
--- a/src/lib/dbus/Makefile.am
+++ b/src/lib/dbus/Makefile.am
@@ -1,7 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
-@EDBUS_CFLAGS@
+@EDBUS_CFLAGS@ @EINA_CFLAGS@
 
 lib_LTLIBRARIES = libedbus.la
 include_HEADERS = E_DBus.h
@@ -18,6 +18,6 @@ libedbus_la_SOURCES = \
 
 
 libedbus_la_LIBADD = \
-@EDBUS_LIBS@
+@EDBUS_LIBS@ @EINA_LIBS@
 libedbus_la_LDFLAGS      = -version-info @version_info@
 

diff --git a/src/lib/hal/Makefile.am b/src/lib/hal/Makefile.am
index d03cdea..3080239 100644 (file)
--- a/src/lib/hal/Makefile.am
+++ b/src/lib/hal/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I $(top_srcdir)/src/lib/dbus \
-@EDBUS_CFLAGS@
+@EDBUS_CFLAGS@ @EINA_CFLAGS@
 
 if BUILD_EHAL
 
@@ -17,7 +17,8 @@ e_hal_util.c
 
 libehal_la_LIBADD = \
 @EDBUS_LIBS@ \
-$(top_builddir)/src/lib/dbus/libedbus.la
+$(top_builddir)/src/lib/dbus/libedbus.la \
+@EINA_LIBS@
 libehal_la_LDFLAGS      = -version-info @version_info@
 
 endif

diff --git a/src/lib/nm/Makefile.am b/src/lib/nm/Makefile.am
index dc2ff55..c293b5b 100644 (file)
--- a/src/lib/nm/Makefile.am
+++ b/src/lib/nm/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I $(top_srcdir)/src/lib/dbus \
-@EDBUS_CFLAGS@
+@EDBUS_CFLAGS@ @EINA_CFLAGS@
 
 if BUILD_ENM
 
@@ -20,7 +20,8 @@ e_nm_util.c
 
 libenm_la_LIBADD = \
 @EDBUS_LIBS@ \
-$(top_builddir)/src/lib/dbus/libedbus.la
+$(top_builddir)/src/lib/dbus/libedbus.la \
+@EINA_LIBS@
 libenm_la_LDFLAGS      = -version-info @version_info@
 
 

diff --git a/src/lib/notification/Makefile.am b/src/lib/notification/Makefile.am
index dd47d49..6e4b664 100644 (file)
--- a/src/lib/notification/Makefile.am
+++ b/src/lib/notification/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I $(top_srcdir)/src/lib/dbus \
-@EDBUS_CFLAGS@ @EVAS_CFLAGS@
+@EDBUS_CFLAGS@ @EVAS_CFLAGS@ @EINA_CFLAGS@
 
 if BUILD_ENOTIFY
 
@@ -20,7 +20,8 @@ daemon.c
 
 libenotify_la_LIBADD = \
 @EDBUS_LIBS@ @EVAS_LIBS@ \
-$(top_builddir)/src/lib/dbus/libedbus.la
+$(top_builddir)/src/lib/dbus/libedbus.la \
+@EINA_LIBS@
 libenotify_la_LDFLAGS      = -version-info @version_info@
 
 endif