- now 'make distcheck' runs clean after using correct path in Makefile.am

- removed useles link to xml.cpp in ecore example

9 files changed, 11 insertions, 12 deletions

diff --git a/examples/echo/Makefile.am b/examples/echo/Makefile.am
index 63fe2eb..6e6dac5 100644
--- a/examples/echo/Makefile.am
+++ b/examples/echo/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = README echo-introspect.xml
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 noinst_PROGRAMS = echo-server
 
diff --git a/examples/echo_ecore/Makefile.am b/examples/echo_ecore/Makefile.am
index 4987e39..d3a6e77 100644
--- a/examples/echo_ecore/Makefile.am
+++ b/examples/echo_ecore/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = README echo-introspect.xml
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
 	$(ecore_CFLAGS)
 
 if ENABLE_ECORE
diff --git a/examples/ecore/Makefile.am b/examples/ecore/Makefile.am
index 7a44868..63c3c0c 100644
--- a/examples/ecore/Makefile.am
+++ b/examples/ecore/Makefile.am
@@ -1,12 +1,12 @@
 EXTRA_DIST = 
 
-AM_CPPFLAGS = -I$(top_srcdir)/include $(ecore_CFLAGS) $(xml_CFLAGS) -I$(top_srcdir)/tools
+AM_CPPFLAGS = $(ecore_CFLAGS) $(xml_CFLAGS) -I$(top_srcdir)/include
 
 if ENABLE_ECORE
 noinst_PROGRAMS = dbus_ecore
 endif
 
-dbus_ecore_SOURCES = dbus_ecore-glue.h dbus_ecore.h dbus_ecore.cpp $(top_srcdir)/tools/xml.cpp
+dbus_ecore_SOURCES = dbus_ecore-glue.h dbus_ecore.h dbus_ecore.cpp 
 dbus_ecore_LDADD = $(top_builddir)/src/libdbus-c++-ecore-1.la \
 	$(top_builddir)/src/libdbus-c++-1.la $(ecore_LIBS) $(xml_LIBS)
 
diff --git a/examples/ecore/dbus_ecore.cpp b/examples/ecore/dbus_ecore.cpp
index c97e22c..d654aca 100644
--- a/examples/ecore/dbus_ecore.cpp
+++ b/examples/ecore/dbus_ecore.cpp
@@ -4,7 +4,6 @@
 
 #include "dbus_ecore.h"
 
-#include <xml.h>
 #include <iostream>
 #include <vector>
 
diff --git a/examples/glib/Makefile.am b/examples/glib/Makefile.am
index cb7ef3c..c0400a8 100644
--- a/examples/glib/Makefile.am
+++ b/examples/glib/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = 
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(gtkmm_CFLAGS) -I$(top_srcdir)/tools
+AM_CPPFLAGS = -I$(top_srcdir)/include $(gtkmm_CFLAGS) -I$(top_srcdir)/tools
 
 if HAVE_GTKMM
 noinst_PROGRAMS = dbus-browser
@@ -8,7 +8,7 @@ endif
 
 dbus_browser_SOURCES = dbus-glue.h dbus-browser.h dbus-browser.cpp $(top_srcdir)/tools/xml.cpp
 dbus_browser_LDADD = $(top_builddir)/src/libdbus-c++-glib-1.la \
-	$(top_builddir)/src/libdbus-c++-1.la $(gtkmm_LIBS)
+	$(top_srcdir)/src/libdbus-c++-1.la $(gtkmm_LIBS)
 
 dbus-glue.h: $(top_srcdir)/data/org.freedesktop.DBus.xml
 	$(top_builddir)/tools/dbusxx-xml2cpp $^ --proxy=$@
diff --git a/examples/hal/Makefile.am b/examples/hal/Makefile.am
index 22868c8..7a4b649 100644
--- a/examples/hal/Makefile.am
+++ b/examples/hal/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 noinst_PROGRAMS = hal-listen
 
diff --git a/examples/properties/Makefile.am b/examples/properties/Makefile.am
index a99749a..a60fd63 100644
--- a/examples/properties/Makefile.am
+++ b/examples/properties/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = propsgs-introspect.xml
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 noinst_PROGRAMS = propsgs-server propsgs-client
 
diff --git a/test/functional/Test1/Makefile.am b/test/functional/Test1/Makefile.am
index f2bb38f..f8a1818 100644
--- a/test/functional/Test1/Makefile.am
+++ b/test/functional/Test1/Makefile.am
@@ -29,10 +29,10 @@ TestApp_SOURCES = \
 	TestAppIntroProvider.h
 
 TestApp_LDFLAGS = \
-	../../../src/libdbus-c++-1.la
+	$(top_builddir)/src/libdbus-c++-1.la
 
 TestApp_CXXFLAGS = \
-	-I../../../include
+	-I$(top_srcdir)/include
 
 AM_CPPFLAGS = 
 
diff --git a/test/generator/Makefile.am b/test/generator/Makefile.am
index 1a29204..6065cab 100644
--- a/test/generator/Makefile.am
+++ b/test/generator/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = dbuscxx_test_generator.xml
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include 
+AM_CPPFLAGS = -I$(top_srcdir)/include 
 
 noinst_PROGRAMS = dbuscxx_test_generator_server