From a10c91764e62c9f4c785d641173a0cc12c83f70e Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Wed, 19 Sep 2012 19:46:58 +0200 Subject: [PATCH] Avoided use of AM_CFLAGS, which is not used in some situations; fixed warning. --- examples/dc_user/Makefile.am | 4 +--- examples/user/Makefile.am | 4 +--- examples/user/main.c | 2 -- lib/Makefile.am | 4 +--- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/examples/dc_user/Makefile.am b/examples/dc_user/Makefile.am index dd5d94c7..db4e4261 100644 --- a/examples/dc_user/Makefile.am +++ b/examples/dc_user/Makefile.am @@ -27,12 +27,10 @@ # #------------------------------------------------------------------------------ -AM_CFLAGS = -Wall - noinst_PROGRAMS = ec_dc_user_example ec_dc_user_example_SOURCES = main.c -ec_dc_user_example_CFLAGS = -I$(top_srcdir)/include +ec_dc_user_example_CFLAGS = -I$(top_srcdir)/include -Wall ec_dc_user_example_LDFLAGS = -L$(top_builddir)/lib/.libs -lethercat -lrt #------------------------------------------------------------------------------ diff --git a/examples/user/Makefile.am b/examples/user/Makefile.am index 6eed3caa..7edd532d 100644 --- a/examples/user/Makefile.am +++ b/examples/user/Makefile.am @@ -27,12 +27,10 @@ # #------------------------------------------------------------------------------ -AM_CFLAGS = -Wall - noinst_PROGRAMS = ec_user_example ec_user_example_SOURCES = main.c -ec_user_example_CFLAGS = -I$(top_srcdir)/include +ec_user_example_CFLAGS = -I$(top_srcdir)/include -Wall ec_user_example_LDFLAGS = -L$(top_builddir)/lib/.libs -lethercat #------------------------------------------------------------------------------ diff --git a/examples/user/main.c b/examples/user/main.c index a1bcc149..790c38df 100644 --- a/examples/user/main.c +++ b/examples/user/main.c @@ -255,8 +255,6 @@ void read_sdo(void) void cyclic_task() { - int i; - // receive process data ecrt_master_receive(master); ecrt_domain_process(domain1); diff --git a/lib/Makefile.am b/lib/Makefile.am index dd3ae296..91977ca2 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -28,14 +28,12 @@ # #------------------------------------------------------------------------------ -AM_CFLAGS = -Wall - lib_LTLIBRARIES = libethercat.la #------------------------------------------------------------------------------ +libethercat_la_CFLAGS = -I$(srcdir)/.. -fno-strict-aliasing -Wall libethercat_la_LDFLAGS = -version-info 1:0:0 -libethercat_la_CFLAGS = -I$(srcdir)/.. -fno-strict-aliasing libethercat_la_SOURCES = \ common.c \ domain.c \