Avoided use of AM_CFLAGS, which is not used in some situations; fixed warning. stable-1.5
authorFlorian Pose <fp@igh-essen.com>
Wed, 19 Sep 2012 19:46:58 +0200
branchstable-1.5
changeset 2425 6a6dec6fc806
parent 2424 39a1b82b5535
child 2426 58572b4208ba
Avoided use of AM_CFLAGS, which is not used in some situations; fixed warning.
examples/dc_user/Makefile.am
examples/user/Makefile.am
examples/user/main.c
lib/Makefile.am
--- a/examples/dc_user/Makefile.am	Tue Sep 11 17:50:56 2012 +0200
+++ b/examples/dc_user/Makefile.am	Wed Sep 19 19:46:58 2012 +0200
@@ -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
 
 #------------------------------------------------------------------------------
--- a/examples/user/Makefile.am	Tue Sep 11 17:50:56 2012 +0200
+++ b/examples/user/Makefile.am	Wed Sep 19 19:46:58 2012 +0200
@@ -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
 
 #------------------------------------------------------------------------------
--- a/examples/user/main.c	Tue Sep 11 17:50:56 2012 +0200
+++ b/examples/user/main.c	Wed Sep 19 19:46:58 2012 +0200
@@ -255,8 +255,6 @@
 
 void cyclic_task()
 {
-    int i;
-
     // receive process data
     ecrt_master_receive(master);
     ecrt_domain_process(domain1);
--- a/lib/Makefile.am	Tue Sep 11 17:50:56 2012 +0200
+++ b/lib/Makefile.am	Wed Sep 19 19:46:58 2012 +0200
@@ -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 \