summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac3
-rw-r--r--src/Makefile.am5
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 3361c67..8a52f80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,9 +54,6 @@ XORG_DEFAULT_OPTIONS
# find the required protocol version
RES_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
PKG_CHECK_MODULES(XRES, x11 xext xextproto [resourceproto >= $RES_VERSION])
-XRES_CFLAGS="$CWARNFLAGS $XRES_CFLAGS"
-AC_SUBST(XRES_CFLAGS)
-AC_SUBST(XRES_LIBS)
XORG_CHECK_MALLOC_ZERO
diff --git a/src/Makefile.am b/src/Makefile.am
index a64c939..fd508da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,10 @@ libXRes_la_SOURCES = \
libXRes_la_LIBADD = @XRES_LIBS@
-AM_CFLAGS = $(CWARNFLAGS) @XRES_CFLAGS@ @MALLOC_ZERO_CFLAGS@
+AM_CFLAGS = \
+ $(CWARNFLAGS) \
+ $(XRES_CFLAGS) \
+ $(MALLOC_ZERO_CFLAGS)
INCLUDES = -I$(top_srcdir)/include