X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2FMakefile.am;h=2792f2109c6908d32cd3c79ca42918262dcce4a4;hb=519c8939aa6d436c8ed48bb0f390e9971676928f;hp=b56aa554c60716d347e4b572fc13de46801ba29d;hpb=90ad51a5a526a9c3ef4ebc2ee577d9ae578f7811;p=catta

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index b56aa55..2792f21 100644
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -32,16 +32,11 @@ AM_CFLAGS= \
 
 AM_LDADD=-lexpat
 
-# GLIB 2.0
-AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD+=$(GLIB20_LIBS)
-
 # libdaemon
 AM_CFLAGS+=$(LIBDAEMON_CFLAGS)
 AM_LDADD+=$(LIBDAEMON_LIBS)
 
 if ENABLE_DBUS
-# DBUS
 AM_CFLAGS+=$(DBUS_CFLAGS)
 AM_LDADD+=$(DBUS_LIBS)
 endif
@@ -52,16 +47,30 @@ AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 sbin_PROGRAMS = \
 	avahi-daemon
 
+noinst_PROGRAMS = \
+	ini-file-parser-test
+
 avahi_daemon_SOURCES = \
 	main.c main.h \
 	simple-protocol.c simple-protocol.h \
-	static-services.c static-services.h
+	static-services.c static-services.h \
+	ini-file-parser.c ini-file-parser.h
+
+avahi_daemon_CFLAGS = $(AM_CFLAGS)
+avahi_daemon_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-core/libavahi-core.la 
+
+ini_file_parser_test_SOURCES = \
+	ini-file-parser.c ini-file-parser.h \
+	ini-file-parser-test.c
+
+ini_file_parser_test_CFLAGS = $(AM_CFLAGS)
+ini_file_parser_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-core/libavahi-core.la 
 
 pkgsysconf_DATA = \
 	avahi-daemon.conf
 
 service_DATA = \
-	example.service
+	ssh.service
 
 pkgdata_DATA = \
 	avahi-service.dtd
@@ -76,10 +85,19 @@ EXTRA_DIST = \
 	EntryGroup.introspect \
 	DomainBrowser.introspect \
 	ServiceTypeBrowser.introspect \
-	ServiceBrowser.introspect
+	ServiceBrowser.introspect \
+	ssh.service \
+	example.service \
+	introspect.dtd \
+	introspect.xsl
 
 if ENABLE_DBUS
-avahi_daemon_SOURCES += dbus-protocol.c dbus-protocol.h
+avahi_daemon_SOURCES += \
+	dbus-protocol.c \
+	dbus-protocol.h
+
+avahi_daemon_LDADD += \
+	../avahi-common/libdbus-watch-glue.a
 
 dbusservice_DATA = avahi-dbus.conf
 
@@ -92,8 +110,7 @@ introspection_DATA = \
 
 endif
 
-avahi_daemon_CFLAGS = $(AM_CFLAGS)
-avahi_daemon_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la
+
 
 xmllint:
 	xmllint --noout --valid example.service