* 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 208aa94e916890a3ace521f111ef2da3ca3a713e..670c8552fc93a7d79dfeb123eec644652ddbf51d 100644 (file)
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -19,10 +19,6 @@
 
 AM_CFLAGS=-I$(top_srcdir)
 
-# GLIB 2.0
-AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD=$(GLIB20_LIBS)
-
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
@@ -32,58 +28,96 @@ avahi_commoninclude_HEADERS = \
        strlst.h \
        address.h \
        alternative.h \
-       rr.h \
-       util.h
-
-noinst_HEADERS = \
-       cdecl.h
-
+       domain.h \
+       cdecl.h \
+       defs.h \
+       malloc.h \
+       watch.h \
+       timeval.h \
+       simple-watch.h \
+       gccmacro.h \
+       error.h \
+       llist.h \
+       rlist.h
+
+if ENABLE_TESTS
 noinst_PROGRAMS = \
        strlst-test \
        domain-test \
        alternative-test \
-       timeval-test
+       timeval-test \
+       watch-test
+endif
 
 lib_LTLIBRARIES = \
        libavahi-common.la 
 
-noinst_LIBRARIES = \
-       libavahi-common-static.a
-
 libavahi_common_la_SOURCES = \
+       malloc.c malloc.h \
        address.c address.h \
-       strlst.c strlst.h \
        alternative.c alternative.h \
-       rr.c rr.h \
-       util.c util.h
-libavahi_common_la_CFLAGS = $(AM_CFLAGS)
-libavahi_common_la_LIBADD = $(AM_LDADD)
+       error.c error.h \
+       strlst.c strlst.h \
+       domain.c domain.h \
+       timeval.c timeval.h \
+       simple-watch.c simple-watch.h \
+       watch.h gccmacro.h \
+       rlist.h rlist.c
 
-libavahi_common_static_a_SOURCES = $(libavahi_common_la_SOURCES)
-libavahi_common_static_a_CFLAGS = $(AM_CFLAGS)
-libavahi_common_static_a_LIBADD =
+libavahi_common_la_CFLAGS = $(AM_CFLAGS)
+libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMMON_VERSION_INFO)
 
 strlst_test_SOURCES = \
        strlst.c strlst.h \
-        strlst-test.c
+       malloc.c malloc.h \
+       strlst-test.c
 strlst_test_CFLAGS = $(AM_CFLAGS)
-strlst_test_LDADD = $(AM_LDADD)
 
 alternative_test_SOURCES = \
        alternative.c alternative.h \
-        alternative-test.c
+       malloc.c malloc.h \
+       domain.c domain.h \
+       alternative-test.c
 alternative_test_CFLAGS = $(AM_CFLAGS)
-alternative_test_LDADD = $(AM_LDADD)
 
 domain_test_SOURCES = \
-       util.c util.h \
+       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 \
+       simple-watch.c simple-watch.h \
+       watch.h \
+       malloc.c malloc.h \
+       watch-test.c
+watch_test_CFLAGS = $(AM_CFLAGS)
 
 timeval_test_SOURCES = \
-       util.c util.h \
+       timeval.c timeval.h \
        timeval-test.c
 timeval_test_CFLAGS = $(AM_CFLAGS)
-timeval_test_LDADD = $(AM_LDADD)
+
+if HAVE_DBUS
+
+noinst_HEADERS = \
+       dbus.h \
+       dbus-watch-glue.h
+
+noinst_LTLIBRARIES = \
+       libdbus-common.la \
+       libdbus-common-pic.la
+
+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_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