diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2010-10-25 12:33:32 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2010-10-25 12:44:39 -0700 |
| commit | 7b8196c9f7723b77b5d18fc1cc2070e557a7f767 (patch) | |
| tree | 5d2bb104d6279633035980e95e72321315a2ee3a | |
| parent | 46ca2da2e8d29d7f1347c9f4e9fb3794dd99cb7a (diff) | |
| download | xorg-lib-libXaw-7b8196c9f7723b77b5d18fc1cc2070e557a7f767.tar.gz | |
Move -I CFLAGS to CPPFLAGS
Previously, setting CPPFLAGS at configure time could result in using the
installed headers rather than the ones included in the package.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | src/Makefile.am | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a77bb13..3bc4b29 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -56,7 +56,9 @@ COMMON_SOURCES = \ XawI18n.h COMMON_CFLAGS = \ - $(CWARNFLAGS) \ + $(CWARNFLAGS) + +COMMON_CPPFLAGS = \ -I${top_srcdir}/include \ -I${top_srcdir}/include/X11/Xaw \ -DPROJECT_ROOT=\"$(prefix)\" @@ -65,6 +67,9 @@ if BUILD_XAW6 lib_LTLIBRARIES += libXaw6.la +libXaw6_la_CPPFLAGS = \ + $(COMMON_CPPFLAGS) + libXaw6_la_CFLAGS = \ $(COMMON_CFLAGS) \ -DOLDXAW \ @@ -100,6 +105,9 @@ if BUILD_XAW7 lib_LTLIBRARIES += libXaw7.la +libXaw7_la_CPPFLAGS = \ + $(COMMON_CPPFLAGS) + libXaw7_la_CFLAGS = \ $(COMMON_CFLAGS) \ -DXAW7 \ |