* Compile tests only when --enable-tests was specified on the configure command line

[catta] / avahi-common / Makefile.am

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index 5556ff4cfd245be2c009d2de3599aef5682c56c5..670c8552fc93a7d79dfeb123eec644652ddbf51d 100644 (file)
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -36,17 +36,18 @@ avahi_commoninclude_HEADERS = \
        timeval.h \
        simple-watch.h \
        gccmacro.h \
-       error.h
-
-noinst_HEADERS = \
-       llist.h
+       error.h \
+       llist.h \
+       rlist.h
 
+if ENABLE_TESTS
 noinst_PROGRAMS = \
        strlst-test \
        domain-test \
        alternative-test \
        timeval-test \
        watch-test
+endif
 
 lib_LTLIBRARIES = \
        libavahi-common.la 
@@ -60,10 +61,11 @@ libavahi_common_la_SOURCES = \
        domain.c domain.h \
        timeval.c timeval.h \
        simple-watch.c simple-watch.h \
-       watch.h gccmacro.h
+       watch.h gccmacro.h \
+       rlist.h rlist.c
 
 libavahi_common_la_CFLAGS = $(AM_CFLAGS)
-libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:0:0
+libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMMON_VERSION_INFO)
 
 strlst_test_SOURCES = \
        strlst.c strlst.h \
@@ -99,7 +101,7 @@ timeval_test_CFLAGS = $(AM_CFLAGS)
 
 if HAVE_DBUS
 
-noinst_HEADERS += \
+noinst_HEADERS = \
        dbus.h \
        dbus-watch-glue.h