[PATCH libXaw3d 3/5] Move compiler flags from AM_CPPFLAGS to AM_CFLAGS

Gaetan Nadon memsize at videotron.ca
Tue Aug 30 19:00:30 PDT 2011


AM_CPPFLAGS should only contain preprocessor directives like -I -D.
The various *_CFLAGS may contain compiler flags as they are obtained
from pkg-config Cflags variable.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 src/Makefile.am |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index c30d355..05962d1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,13 +2,14 @@ lib_LTLIBRARIES = libXaw3d.la
 
 AM_YFLAGS = -d
 AM_CFLAGS = \
-	$(CWARNFLAGS)
+	$(CWARNFLAGS) \
+	$(XAW3D_CFLAGS) \
+	$(X11_CFLAGS) \
+	$(XPM_CFLAGS)
 
 AM_CPPFLAGS = \
 	-I${top_srcdir}/include \
-	-I${top_srcdir}/include/X11/Xaw3d \
-	$(XAW3D_CFLAGS) \
-	$(X11_CFLAGS) $(XPM_CFLAGS)
+	-I${top_srcdir}/include/X11/Xaw3d
 
 #
 # This doesn't appear to be used on any
-- 
1.7.4.1



More information about the xorg-devel mailing list