summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac3
-rw-r--r--src/Makefile.am6
2 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 29bf172..6505afe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,9 +52,6 @@ AC_PROG_LIBTOOL
RANDR_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
AC_SUBST(RANDR_VERSION)
PKG_CHECK_MODULES(RANDR, x11 randrproto >= $RANDR_VERSION xext xextproto xrender renderproto)
-RANDR_CFLAGS="$CWARNFLAGS $RANDR_CFLAGS"
-AC_SUBST(RANDR_CFLAGS)
-AC_SUBST(RANDR_LIBS)
XORG_CHECK_MALLOC_ZERO
diff --git a/src/Makefile.am b/src/Makefile.am
index ab7e778..85b05da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,11 @@ libXrandr_la_SOURCES = \
XrrScreen.c
libXrandr_la_LIBADD = @RANDR_LIBS@
-AM_CFLAGS = @RANDR_CFLAGS@ @MALLOC_ZERO_CFLAGS@
+
+AM_CFLAGS = \
+ $(RANDR_CFLAGS) \
+ $(MALLOC_ZERO_CFLAGS) \
+ $(CWARNFLAGS)
INCLUDES = -I$(top_srcdir)/include/X11/extensions