X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2FMakefile.am;h=e1786f70d58356f9f22372d6aa951440e3447257;hb=c75a6b480b047abc73ee7afd912aef249e9da8e3;hp=1ea7ba43a6710256f26d4bb9e3a204ad803d23ce;hpb=9642bac4b85de24ce62c53ad6a8e2ab4b2dd31ba;p=catta

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index 1ea7ba4..e1786f7 100644
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -22,9 +22,6 @@ AM_CFLAGS=-I$(top_srcdir)
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
-# Need some DBUS defines for dbus.h
-AM_CFLAGS+=$(DBUS_CFLAGS)
-
 avahi_commonincludedir=$(includedir)/avahi-common
 
 avahi_commoninclude_HEADERS = \
@@ -39,10 +36,9 @@ avahi_commoninclude_HEADERS = \
 	timeval.h \
 	simple-watch.h \
 	gccmacro.h \
-	error.h
-
-noinst_HEADERS = \
-	llist.h
+	error.h \
+	llist.h \
+	rlist.h
 
 noinst_PROGRAMS = \
 	strlst-test \
@@ -64,10 +60,10 @@ libavahi_common_la_SOURCES = \
 	timeval.c timeval.h \
 	simple-watch.c simple-watch.h \
 	watch.h gccmacro.h \
-	dbus.c dbus.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) 1:0:1
 
 strlst_test_SOURCES = \
 	strlst.c strlst.h \
@@ -103,22 +99,23 @@ timeval_test_CFLAGS = $(AM_CFLAGS)
 
 if HAVE_DBUS
 
-noinst_HEADERS += \
+noinst_HEADERS = \
 	dbus.h \
 	dbus-watch-glue.h
 
 noinst_LTLIBRARIES = \
-	libdbus-watch-glue.la \
-	libdbus-watch-glue-pic.la
-
-libdbus_watch_glue_la_SOURCES = \
-	dbus-watch-glue.h dbus-watch-glue.c
-libdbus_watch_glue_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
-libdbus_watch_glue_la_LDFLAGS = $(AM_LDFLAGS) -all-static
-
-libdbus_watch_glue_pic_la_SOURCES = $(libdbus_watch_glue_la_SOURCES)
-libdbus_watch_glue_pic_la_CFLAGS = $(libdbus_watch_glue_la_CFLAGS) -fPIC
-libdbus_watch_glue_pic_la_LDFLAGS = $(libdbus_watch_glue_la_LDFLAGS)
+	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