Merge trunk

[awesomized/libmemcached] / example / include.am

diff --git a/example/include.am b/example/include.am
index daae642b95517353087dea5c08a3b893c14f9782..9a1c11b0e580d0891f75295f8f7c70eb8a94559e 100644 (file)
--- a/example/include.am
+++ b/example/include.am
@@ -2,20 +2,23 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
+if HAVE_LIBEVENT
 noinst_PROGRAMS += example/memcached_light
+endif
 
-example_memcached_light_SOURCES= \
-       example/interface_v0.c \
-       example/interface_v1.c \
-       example/memcached_light.c \
-       example/memcached_light.h \
-       example/storage.h
+noinst_HEADERS+= \
+                example/byteorder.h \
+                example/memcached_light.h \
+                example/storage.h
 
-example_memcached_light_LDADD= libmemcached/libmemcachedprotocol.la $(LIBINNODB)
+example_memcached_light_SOURCES= \
+                                example/byteorder.cc \
+                                example/interface_v0.c \
+                                example/interface_v1.c \
+                                example/memcached_light.c
 
-if BUILD_BYTEORDER
-example_memcached_light_LDADD+= libmemcached/libbyteorder.la
-endif
+example_memcached_light_LDADD= libmemcached/libmemcachedprotocol.la \
+                               $(LIBINNODB) $(LTLIBEVENT)
 
 if HAVE_LIBINNODB
 example_memcached_light_SOURCES+= example/storage_innodb.c