[patch 06/15] fix cppflags vs. cflags issues

[Robert Schwebel <r.schwebel@xxxxxxxxxxxxxx>]

Put preprocessor stuff into CPPFLAGS, not into CFLAGS.

Signed-off-by: Robert Schwebel <r.schwebel@xxxxxxxxxxxxxx>

---
 func/gtod_latency/GNUmakefile.am         |    6 +++---
 func/matrix_mult/GNUmakefile.am          |    7 +++++--
 func/measurement/GNUmakefile.am          |    6 +++---
 func/periodic_cpu_load/GNUmakefile.am    |    6 +++---
 func/pi-tests/GNUmakefile.am             |   29 ++++-------------------------
 func/pthread_kill_latency/GNUmakefile.am |    8 ++++----
 func/sched_jitter/GNUmakefile.am         |    3 ++-
 7 files changed, 24 insertions(+), 41 deletions(-)

Index: func/gtod_latency/GNUmakefile.am
===================================================================
--- func/gtod_latency/GNUmakefile.am.orig
+++ func/gtod_latency/GNUmakefile.am
@@ -5,11 +5,11 @@ bin_PROGRAMS = \
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
-	-I$(DESTDIR)/usr/include/nptl
+	-I$(DESTDIR)/usr/include/nptl \
+	-D_GNU_SOURCE
 
 gtod_infinite_CFLAGS = \
-	-O2 \
-	-D_GNU_SOURCE
+	-O2
 
 LDADD = \
          ${top_srcdir}/include/libjvmsim.o \
Index: func/matrix_mult/GNUmakefile.am
===================================================================
--- func/matrix_mult/GNUmakefile.am.orig
+++ func/matrix_mult/GNUmakefile.am
@@ -9,9 +9,12 @@ AM_CPPFLAGS = \
         -I$(top_builddir)/include \
         -I$(DESTDIR)/usr/include/nptl
 
+matrix_mult_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-D_GNU_SOURCE
+
 matrix_mult_CFLAGS = \
-        -O2 \
-        -D_GNU_SOURCE
+        -O2
 
 LDADD = \
          ${top_srcdir}/include/libjvmsim.o \
Index: func/measurement/GNUmakefile.am
===================================================================
--- func/measurement/GNUmakefile.am.orig
+++ func/measurement/GNUmakefile.am
@@ -6,11 +6,11 @@ bin_PROGRAMS = \
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
-	-I$(DESTDIR)/usr/include/nptl
+	-I$(DESTDIR)/usr/include/nptl \
+	-D_GNU_SOURCE
 
 AM_CFLAGS = \
-	-O2 \
-	-D_GNU_SOURCE
+	-O2
 
 AM_LDFLAGS = \
 	-L$(DESTDIR)/usr/lib/nptl \
Index: func/periodic_cpu_load/GNUmakefile.am
===================================================================
--- func/periodic_cpu_load/GNUmakefile.am.orig
+++ func/periodic_cpu_load/GNUmakefile.am
@@ -6,11 +6,11 @@ bin_PROGRAMS = \
 AM_CPPFLAGS = \
         -I$(top_srcdir)/include \
         -I$(top_builddir)/include \
-        -I$(DESTDIR)/usr/include/nptl
+        -I$(DESTDIR)/usr/include/nptl \
+	-D_GNU_SOURCE
 
 AM_CFLAGS = \
-        -O2 \
-        -D_GNU_SOURCE
+        -O2
 
 AM_LDFLAGS = \
         -L$(DESTDIR)/usr/lib/nptl \
Index: func/pi-tests/GNUmakefile.am
===================================================================
--- func/pi-tests/GNUmakefile.am.orig
+++ func/pi-tests/GNUmakefile.am
@@ -19,7 +19,8 @@ endif
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
-	-I$(DESTDIR)/usr/include/nptl
+	-I$(DESTDIR)/usr/include/nptl \
+	-D_GNU_SOURCE
 
 AM_CFLAGS = \
 	-O2
@@ -35,31 +36,9 @@ AM_LDFLAGS = \
         -lrt \
         -lm
 
-testpi_0_CPPFLAGS = \
-	-D_GNU_SOURCE
-
-testpi_1_CPPFLAGS = \
-	-D_GNU_SOURCE
-
-testpi_2_CPPFLAGS = \
-	-D_GNU_SOURCE
-
-testpi_4_CPPFLAGS = \
-	-D_GNU_SOURCE
-
-testpi_5_CPPFLAGS = \
-	-D_GNU_SOURCE
-
-testpi_6_CPPFLAGS = \
-        -D_GNU_SOURCE
-
-
 testpi_7_CPPFLAGS = \
-        -D_GNU_SOURCE
-
-
-sbrk_mutex_CPPFLAGS = \
-        -D_GNU_SOURCE
+	$(AM_CPPFLAGS) \
+	-I$(srcdir)
 
 MAINTAINERCLEANFILES = \
 	GNUmakefile.in
Index: func/pthread_kill_latency/GNUmakefile.am
===================================================================
--- func/pthread_kill_latency/GNUmakefile.am.orig
+++ func/pthread_kill_latency/GNUmakefile.am
@@ -5,12 +5,12 @@ endif
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
-	-I$(DESTDIR)/usr/include/nptl
-
-pthread_kill_latency_CFLAGS = \
-	-O2 \
+	-I$(DESTDIR)/usr/include/nptl \
 	-D_GNU_SOURCE
 
+AM_CFLAGS = \
+	-O2
+
 LDADD = \
          ${top_srcdir}/include/libjvmsim.o \
          ${top_srcdir}/include/librt.o \
Index: func/sched_jitter/GNUmakefile.am
===================================================================
--- func/sched_jitter/GNUmakefile.am.orig
+++ func/sched_jitter/GNUmakefile.am
@@ -3,7 +3,8 @@ bin_PROGRAMS = sched_jitter
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
-	-I$(DESTDIR)/usr/include/nptl
+	-I$(DESTDIR)/usr/include/nptl \
+	-D_GNU_SOURCE
 
 sched_jitter_CFLAGS = \
 	-O2

--
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

-
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html