4 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index bcdfca7..7f29d24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,6 @@ XTRANS_CONNECTION_FLAGS
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XRX, x11 xt xext xtrans xproxymngproto xau ice)
-XRX_CFLAGS="$CWARNFLAGS $XRX_CFLAGS"
 
 # Check for mozilla/firefox plugin headers via pkg-config.
 if test "x$PLUGIN_CFLAGS" = x ; then
diff --git a/helper/Makefile.am b/helper/Makefile.am
index 265bce7..375644e 100644
--- a/helper/Makefile.am
+++ b/helper/Makefile.am
@@ -23,8 +23,8 @@ bin_PROGRAMS = xrx
 
 INCLUDES = -I$(top_srcdir)/rx
 
-AM_CFLAGS = @XRX_CFLAGS@
-LDADD = @XRX_LIBS@
+AM_CFLAGS = $(CWARNFLAGS) $(XRX_CFLAGS)
+LDADD = $(XRX_LIBS)
 
 xrx_SOURCES =		\
 	GetUrl.c	\
diff --git a/plugin/Makefile.am b/plugin/Makefile.am
index 60dd6b8..dbfdb61 100644
--- a/plugin/Makefile.am
+++ b/plugin/Makefile.am
@@ -32,9 +32,10 @@ PLUGIN_DEFINES = -DXP_UNIX -DMOZ_X11 -DOJI
 DEFINES = -DNETSCAPE_PLUGIN $(PLUGIN_DEFINES)
 
 AM_CPPFLAGS = $(DEFINES)
-AM_CFLAGS = -DXP_UNIX @XRX_CFLAGS@ @XRX_PLUGIN_CFLAGS@ @PLUGIN_CFLAGS@
+AM_CFLAGS = -DXP_UNIX $(CWARNFLAGS) \
+    $(XRX_CFLAGS) $(XRX_PLUGIN_CFLAGS) $(PLUGIN_CFLAGS)
 
-libxrx_la_LIBADD = @XRX_LIBS@ @XRX_PLUGIN_LIBS@
+libxrx_la_LIBADD = $(XRX_LIBS) $(XRX_PLUGIN_LIBS)
 libxrx_la_LDFLAGS = -avoid-version -module
 
 PARAMS_SRCS = $(RXSRC)/PRead.c $(RXSRC)/PParse.c $(RXSRC)/BuildReq.c
diff --git a/xnest-plugin/Makefile.am b/xnest-plugin/Makefile.am
index b31336e..3b9fca4 100644
--- a/xnest-plugin/Makefile.am
+++ b/xnest-plugin/Makefile.am
@@ -46,7 +46,7 @@ libxrxnest_la_SOURCES = \
 	$(XMISC_SRCS)	\
 	$(PLUGIN_SRCS)
 
-AM_CFLAGS = @XRX_CFLAGS@ @XRX_PLUGIN_CFLAGS@ @PLUGIN_CFLAGS@
+AM_CFLAGS = $(CWARNFLAGS) $(XRX_CFLAGS) $(XRX_PLUGIN_CFLAGS) $(PLUGIN_CFLAGS)
 
-libxrxnest_la_LIBADD = @XRX_LIBS@ @XRX_PLUGIN_LIBS@
+libxrxnest_la_LIBADD = $(XRX_LIBS) $(XRX_PLUGIN_LIBS)
 libxrxnest_la_LDFLAGS = -avoid-version -module