(trunk) replace LIBEVENT_CPPFLAGS with LIBEVENT_CFLAGS

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) \

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)
 
 

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) \

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) \

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) \