X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2FMakefile.am;h=3c6dbcff2ddc320e97b01457a24c283306f30db1;hb=1d6cecfe69fa2faea1c81ccd899bac24aad64273;hp=e0e7d86e071037da073678c689d27e1ac5b1ddd9;hpb=6e35536bddb52c8e6bc201265c77a846d879b5a3;p=catta

diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index e0e7d86..3c6dbcf 100644
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -19,13 +19,6 @@
 
 AM_CFLAGS=-I$(top_srcdir)
 
-# GLIB 2.0
-AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD=$(GLIB20_LIBS)
-
-# Import stuff from avahi-common
-COMMON_LDADD=../avahi-common/libavahi-common.la
-
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
@@ -78,28 +71,29 @@ libavahi_core_la_SOURCES = \
 	hashmap.c hashmap.h
 
 libavahi_core_la_CFLAGS = $(AM_CFLAGS)
-libavahi_core_la_LIBADD = $(AM_LDADD) $(COMMON_LDADD)
+libavahi_core_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
+libavahi_core_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:0:0
 
 prioq_test_SOURCES = \
 	prioq-test.c  \
 	prioq.c prioq.h
 prioq_test_CFLAGS = $(AM_CFLAGS)
-prioq_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
+prioq_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
 
 avahi_test_SOURCES = \
 	avahi-test.c
 avahi_test_CFLAGS = $(AM_CFLAGS)
-avahi_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la
+avahi_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la libavahi-core.la
 
 conformance_test_SOURCES = \
 	conformance-test.c
 conformance_test_CFLAGS = $(AM_CFLAGS)
-conformance_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la
+conformance_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la libavahi-core.la
 
 avahi_reflector_SOURCES = \
 	avahi-reflector.c
 avahi_reflector_CFLAGS = $(AM_CFLAGS)
-avahi_reflector_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la
+avahi_reflector_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la libavahi-core.la
 
 dns_test_SOURCES = \
 	dns.c dns.h \
@@ -109,21 +103,22 @@ dns_test_SOURCES = \
 	rr.c rr.h \
 	hashmap.c hashmap.h
 dns_test_CFLAGS = $(AM_CFLAGS)
-dns_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
+dns_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
 
 timeeventq_test_SOURCES = \
 	timeeventq-test.c \
 	timeeventq.h timeeventq.c \
-	prioq.h prioq.c
+	prioq.h prioq.c \
+	log.c log.h
 timeeventq_test_CFLAGS = $(AM_CFLAGS)
-timeeventq_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
+timeeventq_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
 
 hashmap_test_SOURCES = \
 	hashmap-test.c \
 	hashmap.h hashmap.c \
 	util.h util.c
 hashmap_test_CFLAGS = $(AM_CFLAGS)
-hashmap_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
+hashmap_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
 
 valgrind: avahi-test
 	libtool --mode=execute valgrind ./avahi-test