[sheepdog] [PATCH v2 2/2] configure: fix multiply defined warning

[Liu Yuan]

From: Liu Yuan <liuyuan at cmss.chinamobile.com>

This patch fix following warning:

Building configuration system...
lib/Makefile.am:39: warning: AM_CPPFLAGS multiply defined in condition TRUE ...
lib/Makefile.am:3: ... 'AM_CPPFLAGS' previously defined here
sheep/Makefile.am:76: warning: AM_CPPFLAGS multiply defined in condition TRUE ...
sheep/Makefile.am:22: ... 'AM_CPPFLAGS' previously defined here
sheep/Makefile.am:77: warning: noinst_HEADERS multiply defined in condition TRUE ...
sheep/Makefile.am:66: ... 'noinst_HEADERS' previously defined here
Now run ./configure and make

Signed-off-by: Liu Yuan <liuyuan at cmss.chinamobile.com>
---
 lib/Makefile.am   | 2 +-
 sheep/Makefile.am | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0fa6dd8..e1dfb1b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -36,7 +36,7 @@ AM_CPPFLAGS		+= -DENABLE_TRACE
 endif
 
 # for LTTng ust tracepoints
-AM_CPPFLAGS		= -I$(top_srcdir)/lib/tracepoint
+AM_CPPFLAGS		+= -I$(top_srcdir)/lib/tracepoint
 noinst_HEADERS		=  tracepoint/work_tp.h tracepoint/sockfd_cache_tp.h tracepoint/event_tp.h
 
 if BUILD_LTTNG_UST
diff --git a/sheep/Makefile.am b/sheep/Makefile.am
index 20f1553..7a08838 100644
--- a/sheep/Makefile.am
+++ b/sheep/Makefile.am
@@ -73,8 +73,8 @@ sheep_LDADD		+= -leq_embed
 endif
 
 # for LTTng ust tracepoints
-AM_CPPFLAGS		= -I$(top_srcdir)/sheep/tracepoint
-noinst_HEADERS		=  tracepoint/request_tp.h
+AM_CPPFLAGS		+= -I$(top_srcdir)/sheep/tracepoint
+noinst_HEADERS		+=  tracepoint/request_tp.h
 
 if BUILD_LTTNG_UST
 sheep_SOURCES	+= tracepoint/request_tp.c
-- 
1.9.1