with connman 07x changes - make sure headers dont conflict with old

edbus1.x too.

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

diff --git a/econnman-0.7x.pc.in b/econnman-0.7x.pc.in
index 744eaca..f3ba96a 100644 (file)
--- a/econnman-0.7x.pc.in
+++ b/econnman-0.7x.pc.in
@@ -8,4 +8,4 @@ Description: network connection manager (connman v0.7x)
 @pkgconfig_requires_private@: @requirement_econnman0_7x@
 Version: @VERSION@
 Libs: -L${libdir} -leconnman0_7x
-Cflags: -I${includedir}/e_dbus-@VMAJ@/connman0_7x
+Cflags: -I${includedir}/e_dbus-@VMAJ@

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index a83b695..21deb10 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,12 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-EDBUS_CPPFLAGS = \
--I$(top_srcdir)/src/lib/dbus \
--I$(top_srcdir)/src/lib/notification \
--I$(top_srcdir)/src/lib/bluez \
--I$(top_srcdir)/src/lib/ofono \
--I$(top_srcdir)/src/lib/ukit \
-@EDBUS_CFLAGS@
+EDBUS_CPPFLAGS = @EDBUS_CFLAGS@
 
 bin_PROGRAMS =
 
@@ -88,7 +82,7 @@ if BUILD_EDBUS_CONNMAN0_7X_TEST
 e_dbus_connman0_7x_test_SOURCES = e_dbus_connman0_7x_test.c
 e_dbus_connman0_7x_test_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/dbus \
--I$(top_srcdir)/src/lib/connman0_7x \
+-I$(top_srcdir)/src/lib \
 @EDBUS_CONNMAN0_7X_TEST_CFLAGS@
 e_dbus_connman0_7x_test_LDADD = \
 $(top_builddir)/src/lib/dbus/libedbus.la \
@@ -98,7 +92,7 @@ $(top_builddir)/src/lib/connman0_7x/libeconnman0_7x.la \
 e_dbus_connman0_7x_test_api_SOURCES = e_dbus_connman0_7x_test_api.c
 e_dbus_connman0_7x_test_api_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/dbus \
--I$(top_srcdir)/src/lib/connman0_7x \
+-I$(top_srcdir)/src/lib \
 @EDBUS_CONNMAN0_7X_TEST_CFLAGS@
 e_dbus_connman0_7x_test_api_LDADD = \
 $(top_builddir)/src/lib/dbus/libedbus.la \

diff --git a/src/bin/e_dbus_connman0_7x_test.c b/src/bin/e_dbus_connman0_7x_test.c
index 6767b1c..971a114 100644 (file)
--- a/src/bin/e_dbus_connman0_7x_test.c
+++ b/src/bin/e_dbus_connman0_7x_test.c
@@ -3,7 +3,7 @@
 #endif
 
 #define E_CONNMAN_I_KNOW_THIS_API_IS_SUBJECT_TO_CHANGE 1
-#include "E_Connman.h"
+#include "connman0_7x/E_Connman.h"
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>

diff --git a/src/bin/e_dbus_connman0_7x_test_api.c b/src/bin/e_dbus_connman0_7x_test_api.c
index b975f7c..c8450e8 100644 (file)
--- a/src/bin/e_dbus_connman0_7x_test_api.c
+++ b/src/bin/e_dbus_connman0_7x_test_api.c
@@ -3,7 +3,7 @@
 #endif
 
 #define E_CONNMAN_I_KNOW_THIS_API_IS_SUBJECT_TO_CHANGE 1
-#include "E_Connman.h"
+#include "connman0_7x/E_Connman.h"
 #include <stdio.h>
 #include <string.h>