X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2FMakefile.am;h=972e9ad8ad44ea19915a00c0921f8a5a2a476f9e;hb=d322a943be5387a539f8f3ea3a19a7e2ed5a55a2;hp=aa83b9381328290716a457864af292f2ab50b281;hpb=88d989fdf558e9be1fea49f63a8d69e2054d46ab;p=catta

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index aa83b93..972e9ad 100644
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -35,10 +35,10 @@ avahi_commoninclude_HEADERS = \
 	watch.h \
 	timeval.h \
 	simple-watch.h \
-	gccmacro.h
-
-noinst_HEADERS = \
-	llist.h
+	gccmacro.h \
+	error.h \
+	llist.h \
+	rlist.h
 
 noinst_PROGRAMS = \
 	strlst-test \
@@ -59,10 +59,11 @@ 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_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:0:0
+libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMMON_VERSION_INFO)
 
 strlst_test_SOURCES = \
 	strlst.c strlst.h \
@@ -98,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