From 73f3c3ad8cfcda38b8108331d8c1eefa22443fbd Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@transmissionbt.com>
Date: Sun, 14 Jun 2009 16:51:22 +0000
Subject: [PATCH] (trunk) replace LIBEVENT_CPPFLAGS with LIBEVENT_CFLAGS

---
 cli/Makefile.am             | 3 ++-
 configure.ac                | 6 +++---
 daemon/Makefile.am          | 3 ++-
 gtk/Makefile.am             | 3 +--
 libtransmission/Makefile.am | 6 ++----
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/cli/Makefile.am b/cli/Makefile.am
index 1bc47ab55..70fa1c7fb 100644
--- a/cli/Makefile.am
+++ b/cli/Makefile.am
@@ -1,6 +1,7 @@
-AM_CPPFLAGS = -I$(top_srcdir) $(LIBEVENT_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) 
 
 AM_CFLAGS = \
+    $(LIBEVENT_CFLAGS) \
     $(OPENSSL_CFLAGS) \
     $(LIBCURL_CFLAGS) \
     $(ZLIB_CFLAGS) \
diff --git a/configure.ac b/configure.ac
index e35380dfc..16f19e808 100644
--- a/configure.ac
+++ b/configure.ac
@@ -187,13 +187,13 @@ fi
 if test "x$libevent_source" = "xbundled"; then
     AC_MSG_WARN([using our own libevent from third-party/libevent/])
     AC_MSG_WARN([if you are cross-compiling this is probably NOT what you want.])
-    LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent -I\$(top_builddir)/third-party/libevent"
+    LIBEVENT_CFLAGS="-I\$(top_srcdir)/third-party/libevent -I\$(top_builddir)/third-party/libevent"
     LIBEVENT_LIBS="\$(top_builddir)/third-party/libevent/libevent.la"
 else
-    LIBEVENT_CPPFLAGS=""
+    LIBEVENT_CFLAGS=""
     LIBEVENT_LIBS="-levent -lrt"
 fi
-AC_SUBST(LIBEVENT_CPPFLAGS)
+AC_SUBST(LIBEVENT_CFLAGS)
 AC_SUBST(LIBEVENT_LIBS)
 
 
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 59ee65a9a..6c30662f1 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -1,6 +1,7 @@
-AM_CPPFLAGS = -I@top_srcdir@ $(LIBEVENT_CPPFLAGS) -I$(top_srcdir)/third-party/ -DEMBEDDED
+AM_CPPFLAGS = -I@top_srcdir@ -DEMBEDDED
 
 AM_CFLAGS = \
+    $(LIBEVENT_CFLAGS) \
     $(OPENSSL_CFLAGS) \
     $(LIBCURL_CFLAGS) \
     $(ZLIB_CFLAGS) \
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 71a54b813..b1e33d73c 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -16,12 +16,11 @@ sexy-marshal.c:	marshal.list
 
 AM_CPPFLAGS = \
     -I$(top_srcdir) \
-    -I$(top_srcdir)/third-party/ \
-    $(LIBEVENT_CPPFLAGS) \
     -DTRANSMISSIONLOCALEDIR=\""$(transmissionlocaledir)"\" \
     $(GTK_EXTRA_CPPFLAGS)
 
 AM_CFLAGS = \
+    $(LIBEVENT_CFLAGS) \
     $(GTK_CFLAGS) \
     $(LIBCURL_CFLAGS) \
     $(GIO_CFLAGS) \
diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am
index 21c71e45b..1ea9950f1 100644
--- a/libtransmission/Makefile.am
+++ b/libtransmission/Makefile.am
@@ -1,9 +1,7 @@
-AM_CPPFLAGS = \
-	-I. -I$(top_srcdir) -I$(top_srcdir)/third-party/ \
-	-D__TRANSMISSION__ $(LIBEVENT_CPPFLAGS) \
-	-DPACKAGE_DATA_DIR=\""$(datadir)"\"
+AM_CPPFLAGS = -I. -I$(top_srcdir) -I$(top_srcdir)/third-party/ -D__TRANSMISSION__ -DPACKAGE_DATA_DIR=\""$(datadir)"\"
 
 AM_CFLAGS = \
+    $(LIBEVENT_CFLAGS) \
     $(LIBCURL_CFLAGS) \
     $(OPENSSL_CFLAGS) \
     $(PTHREAD_CFLAGS) \