diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-08-08 10:45:47 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-08-08 10:45:47 +0000 |
| commit | 15cbcb2d3c23c83f7ae5f009e20d5ba0eb4b3679 (patch) | |
| tree | 1318bf3d4c5a27ba1af05dac8e80cf265cc47f12 /avahi-core | |
| parent | eda741119700f70ddb8c960abf12b9869197145d (diff) | |
* simply compilation a little
* fix avahi-dnsconfd forking
* clean up init script output a little
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@269 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-core')
| -rw-r--r-- | avahi-core/Makefile.am | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am index 2a2d134..8aad962 100644 --- a/avahi-core/Makefile.am +++ b/avahi-core/Makefile.am @@ -26,7 +26,6 @@ AM_LDADD=$(GLIB20_LIBS) # Import stuff from avahi-common AM_CFLAGS+=-I$(top_srcdir)/avahi-common COMMON_LDADD=../avahi-common/libavahi-common.la -STATIC_COMMON_LDADD=../avahi-common/libavahi-common-static.a # This cool debug trap works on i386/gcc only AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' @@ -80,39 +79,36 @@ prioq_test_SOURCES = \ prioq-test.c \ prioq.c prioq.h prioq_test_CFLAGS = $(AM_CFLAGS) -prioq_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD) +prioq_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) avahi_test_SOURCES = \ - avahi-test.c \ - $(libavahi_core_la_SOURCES) + avahi-test.c avahi_test_CFLAGS = $(AM_CFLAGS) -avahi_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD) +avahi_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la conformance_test_SOURCES = \ - conformance-test.c \ - $(libavahi_core_la_SOURCES) + conformance-test.c conformance_test_CFLAGS = $(AM_CFLAGS) -conformance_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD) +conformance_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la avahi_reflector_SOURCES = \ - avahi-reflector.c \ - $(libavahi_core_la_SOURCES) + avahi-reflector.c avahi_reflector_CFLAGS = $(AM_CFLAGS) -avahi_reflector_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD) +avahi_reflector_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la dns_test_SOURCES = \ dns.c dns.h \ dns-test.c \ log.c log.h dns_test_CFLAGS = $(AM_CFLAGS) -dns_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD) +dns_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) timeeventq_test_SOURCES = \ timeeventq-test.c \ timeeventq.h timeeventq.c \ prioq.h prioq.c timeeventq_test_CFLAGS = $(AM_CFLAGS) -timeeventq_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD) +timeeventq_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) valgrind: avahi-test libtool --mode=execute valgrind ./avahi-test |