* 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 4310797f85f42e3e2228693dc91de11b3eb2403b..670c8552fc93a7d79dfeb123eec644652ddbf51d 100644 (file)
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -31,21 +31,23 @@ avahi_commoninclude_HEADERS = \
        domain.h \
        cdecl.h \
        defs.h \
-       malloc.h
+       malloc.h \
        watch.h \
        timeval.h \
        simple-watch.h \
-       gccmacro.h
-
-noinst_HEADERS = \
-       llist.h
+       gccmacro.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 
@@ -59,17 +61,17 @@ 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_LIBADD = $(AM_LDADD)
+libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMMON_VERSION_INFO)
 
 strlst_test_SOURCES = \
        strlst.c strlst.h \
        malloc.c malloc.h \
        strlst-test.c
 strlst_test_CFLAGS = $(AM_CFLAGS)
-strlst_test_LDADD = $(AM_LDADD)
 
 alternative_test_SOURCES = \
        alternative.c alternative.h \
@@ -77,14 +79,12 @@ alternative_test_SOURCES = \
        domain.c domain.h \
        alternative-test.c
 alternative_test_CFLAGS = $(AM_CFLAGS)
-alternative_test_LDADD = $(AM_LDADD)
 
 domain_test_SOURCES = \
        domain.c domain.h \
        malloc.c malloc.h \
        domain-test.c
 domain_test_CFLAGS = $(AM_CFLAGS)
-domain_test_LDADD = $(AM_LDADD)
 
 watch_test_SOURCES = \
        timeval.c timeval.h \
@@ -93,28 +93,31 @@ watch_test_SOURCES = \
        malloc.c malloc.h \
        watch-test.c
 watch_test_CFLAGS = $(AM_CFLAGS)
-watch_test_LDADD = $(AM_LDADD)
 
 timeval_test_SOURCES = \
        timeval.c timeval.h \
        timeval-test.c
 timeval_test_CFLAGS = $(AM_CFLAGS)
-timeval_test_LDADD = $(AM_LDADD)
 
+if HAVE_DBUS
 
-
-if ENABLE_DBUS
-noinst_HEADERS += \
+noinst_HEADERS = \
        dbus.h \
        dbus-watch-glue.h
 
-noinst_LIBRARIES = \
-       libdbus-watch-glue.a
+noinst_LTLIBRARIES = \
+       libdbus-common.la \
+       libdbus-common-pic.la
 
-libdbus_watch_glue_a_SOURCES = \
-       dbus-watch-glue.h dbus-watch-glue.c
+libdbus_common_la_SOURCES = \
+       dbus-watch-glue.h dbus-watch-glue.c \
+       dbus.h dbus.c
+libdbus_common_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+libdbus_common_la_LDFLAGS = $(AM_LDFLAGS) -all-static
 
-libdbus_watch_glue_a_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+libdbus_common_pic_la_SOURCES = $(libdbus_common_la_SOURCES)
+libdbus_common_pic_la_CFLAGS = $(libdbus_common_la_CFLAGS) -fPIC
+libdbus_common_pic_la_LDFLAGS = $(libdbus_common_la_LDFLAGS)
 
 endif