ICC fixes

[awesomized/libmemcached] / clients / Makefile.am

diff --git a/clients/Makefile.am b/clients/Makefile.am
index e5a1f0c0afff8d7e5eb9eea1a84a2117a500fc7e..e3939eb20edfb974493ad0ce0c8b37721fe0ec24 100644 (file)
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -1,11 +1,24 @@
 LDADDS = libutilities.la $(top_builddir)/libmemcached/libmemcached.la
 
-bin_PROGRAMS = memcat memdump memcp memstat memrm memflush memslap memerror memcapable
+bin_PROGRAMS = memcat memdump memcp memstat memrm memflush memerror memcapable
 
-noinst_HEADERS = client_options.h \
-               utilities.h \
+if HAVE_LIBEVENT
+  bin_PROGRAMS += memslap
+endif
+
+noinst_HEADERS = \
+               client_options.h \
+               execute.h \
                generator.h \
-               execute.h
+               ms_atomic.h \
+               ms_conn.h \
+               ms_memslap.h \
+               ms_setting.h \
+               ms_sigsegv.h \
+               ms_stats.h \
+               ms_task.h \
+               ms_thread.h \
+               utilities.h
 
 noinst_LTLIBRARIES= libutilities.la libgenexec.la
 
@@ -33,9 +46,15 @@ memflush_LDADD = $(LDADDS)
 memerror_SOURCES = memerror.c
 memerror_LDADD = $(LDADDS)
 
-memslap_SOURCES = memslap.c
-memslap_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-memslap_LDADD = $(PTHREAD_LIBS) libgenexec.la $(LDADDS)
+memslap_SOURCES = \
+               memslap.c \
+               ms_conn.c \
+               ms_setting.c \
+               ms_sigsegv.c \
+               ms_stats.c \
+               ms_task.c \
+               ms_thread.c
+memslap_LDADD = $(LTLIBEVENT) libgenexec.la $(LDADDS)
 
 memcapable_SOURCES = memcapable.c
 if BUILD_BYTEORDER