builddir and srcdir, tbc.
authorFlorian Pose <fp@igh-essen.com>
Wed, 04 Feb 2009 17:37:06 +0000
changeset 1354 e2fb03ca54ef
parent 1353 22b1de4c74e4
child 1355 df9be2b80b9a
builddir and srcdir, tbc.
examples/user/Makefile.am
tool/Makefile.am
--- a/examples/user/Makefile.am	Wed Feb 04 17:06:14 2009 +0000
+++ b/examples/user/Makefile.am	Wed Feb 04 17:37:06 2009 +0000
@@ -29,7 +29,7 @@
 noinst_PROGRAMS = ec_user_example
 
 ec_user_example_SOURCES = main.c
-ec_user_example_CFLAGS = -I$(srcdir)/../../include
-ec_user_example_LDFLAGS = -L$(srcdir)/../../lib/.libs -lethercat
+ec_user_example_CFLAGS = -I$(top_srcdir)/include
+ec_user_example_LDFLAGS = -L$(top_builddir)/lib/.libs -lethercat
 
 #------------------------------------------------------------------------------
--- a/tool/Makefile.am	Wed Feb 04 17:06:14 2009 +0000
+++ b/tool/Makefile.am	Wed Feb 04 17:37:06 2009 +0000
@@ -83,12 +83,12 @@
 	SdoCommand.h \
 	sii_crc.h
 
-REV = `if test -s $(srcdir)/../svnrevision; then \
-		cat $(srcdir)/../svnrevision; \
+REV = `if test -s $(top_srcdir)/svnrevision; then \
+		cat $(top_srcdir)/svnrevision; \
 	else \
 		svnversion $(srcdir)/.. 2>/dev/null || echo "unknown"; \
 	fi`
 
-ethercat_CXXFLAGS = -I../master -Wall -DSVNREV=$(REV)
+ethercat_CXXFLAGS = -I$(top_srcdir)/master -Wall -DSVNREV=$(REV)
 
 #------------------------------------------------------------------------------