From 50c8c0b45b8b7ec2a521d1655b88282d0488fb62 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Wed, 4 Feb 2009 17:37:06 +0000 Subject: [PATCH] builddir and srcdir, tbc. --- examples/user/Makefile.am | 4 ++-- tool/Makefile.am | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/user/Makefile.am b/examples/user/Makefile.am index ec0452dd..2ea75429 100644 --- a/examples/user/Makefile.am +++ b/examples/user/Makefile.am @@ -29,7 +29,7 @@ AM_CFLAGS = -Wall 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 #------------------------------------------------------------------------------ diff --git a/tool/Makefile.am b/tool/Makefile.am index b2ad6efb..afd33220 100644 --- a/tool/Makefile.am +++ b/tool/Makefile.am @@ -83,12 +83,12 @@ noinst_HEADERS = \ 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) #------------------------------------------------------------------------------