diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-11-02 16:34:14 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-11-06 18:10:56 -0800 |
| commit | 28d16f8ce9dd6ed681e6bc149878002b093c976f (patch) | |
| tree | 2b148b5b6746ea60f53522850b5d98388cd928d4 | |
| parent | 9f94bf9de7607c11ab82667a73a4160d705e355c (diff) | |
Fix CFLAGS/CPPFLAGS so lint works properly
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 8c674a9..fa93255 100644 --- a/configure.ac +++ b/configure.ac @@ -36,7 +36,6 @@ XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XEXT, [xproto >= 7.0.13] [x11 >= 1.1.99.1] [xextproto >= 7.0.99.2]) -XEXT_CFLAGS="$CWARNFLAGS $XEXT_CFLAGS" AC_SUBST(XEXT_CFLAGS) AC_SUBST(XEXT_LIBS) @@ -53,7 +52,6 @@ XORG_PROG_RAWCPP dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT XORG_LINT_LIBRARY([Xext]) -LINT_FLAGS="${LINT_FLAGS} ${XEXT_CFLAGS}" AC_OUTPUT([Makefile man/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 6a7d379..b9b43f7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,10 +1,12 @@ lib_LTLIBRARIES=libXext.la -AM_CFLAGS=\ +AM_CPPFLAGS=\ -I$(top_srcdir)/include \ -I$(top_srcdir)/include/X11/extensions\ $(XEXT_CFLAGS) $(MALLOC_ZERO_CFLAGS) +AM_CFLAGS=$(CWARNFLAGS) + libXext_la_LDFLAGS = -version-number $(XEXT_SOREV) -no-undefined libXext_la_LIBADD = $(XEXT_LIBS) |