* add four new AvahiStringList functions (this is four you, Sebastien!)

[catta] / avahi-daemon / Makefile.am

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index 491e5cefd6a5bba1309fd26c36c51806521e00e6..32831ba710dd67469fd513e9ec6d74518d697225 100644 (file)
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -17,45 +17,47 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
+AM_CFLAGS=-I$(top_srcdir)
+
+# This cool debug trap works on i386/gcc only
+AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
+
+if HAVE_LIBDAEMON
+if HAVE_EXPAT
+
 pkgsysconfdir=$(sysconfdir)/avahi
 servicedir=$(pkgsysconfdir)/services
 introspectiondir=$(pkgdatadir)/introspection
 dbusservicedir=$(DBUS_SYS_DIR)
 
-AM_CFLAGS= \
-       -I$(top_srcdir) \
+AM_CFLAGS+= \
        -DAVAHI_DAEMON_RUNTIME_DIR=\"$(avahi_runtime_dir)/avahi-daemon/\" \
        -DAVAHI_SOCKET=\"$(avahi_socket)\" \
        -DAVAHI_SERVICE_DIR=\"$(servicedir)\" \
        -DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi-daemon.conf\" \
        -DAVAHI_DBUS_INTROSPECTION_DIR=\"$(introspectiondir)\" 
 
-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
-
-# This cool debug trap works on i386/gcc only
-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) $(LIBDAEMON_CFLAGS)
+avahi_daemon_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-core/libavahi-core.la $(LIBDAEMON_LIBS) -lexpat
+
+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
@@ -66,6 +68,32 @@ service_DATA = \
 pkgdata_DATA = \
        avahi-service.dtd
 
+
+if HAVE_DBUS
+
+avahi_daemon_SOURCES += \
+       dbus-protocol.c \
+       dbus-protocol.h
+
+avahi_daemon_LDADD += \
+       ../avahi-common/libdbus-common.la \
+       $(DBUS_LIBS)
+
+avahi_daemon_CFLAGS += $(DBUS_CFLAGS)
+
+dbusservice_DATA = avahi-dbus.conf
+
+introspection_DATA = \
+       Server.introspect \
+       EntryGroup.introspect \
+       DomainBrowser.introspect \
+       ServiceTypeBrowser.introspect \
+       ServiceBrowser.introspect
+
+endif
+endif
+endif
+
 EXTRA_DIST = \
        avahi-service.dtd \
        avahi-daemon.conf \
@@ -82,23 +110,6 @@ EXTRA_DIST = \
        introspect.dtd \
        introspect.xsl
 
-if ENABLE_DBUS
-avahi_daemon_SOURCES += dbus-protocol.c dbus-protocol.h
-
-dbusservice_DATA = avahi-dbus.conf
-
-introspection_DATA = \
-       Server.introspect \
-       EntryGroup.introspect \
-       DomainBrowser.introspect \
-       ServiceTypeBrowser.introspect \
-       ServiceBrowser.introspect
-
-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
        xmllint --noout --valid Server.introspect