summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-07-07 15:45:50 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-07-07 15:45:50 -0700
commit040bfd8f055f7e49f15e457842b8bca4f8d2020a (patch)
tree022c893e08feb506391850ede2120adf3e38a758
parent233b72428a47272b599a6be0708b06f7ed674f7c (diff)
Move CWARNFLAGS to Makefile.am for easier build-time overriding
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am2
2 files changed, 1 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index a2e7438..da6feaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,6 @@ XORG_CWARNFLAGS
# Check for dependencies
PKG_CHECK_MODULES(FS, xproto fontsproto)
-FS_CFLAGS="$CWARNFLAGS $FS_CFLAGS"
AC_SUBST(FS_CFLAGS)
AC_SUBST(FS_LIBS)
#
diff --git a/src/Makefile.am b/src/Makefile.am
index a9a347b..3333103 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,7 +29,7 @@ libFS_la_SOURCES = \
FSSynchro.c \
fs_transport.c
-AM_CFLAGS = $(FS_CFLAGS) $(XTRANS_CFLAGS) $(MALLOC_ZERO_CFLAGS) \
+AM_CFLAGS = $(CWARNFLAGS) $(FS_CFLAGS) $(XTRANS_CFLAGS) $(MALLOC_ZERO_CFLAGS) \
-DFS_t -DTRANS_CLIENT
libFS_la_LIBADD = $(FS_LIBS) $(XTRANS_LIBS)