* cleanup build system a little

[catta] / avahi-daemon / Makefile.am

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index 563b8d1c71bcb2ae4e15505802bf9553a47a944c..558c55a55781a0f555207e296a2bab6c0d5b65b7 100644 (file)
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -17,33 +17,26 @@
 # 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
-
-# libdaemon
-AM_CFLAGS+=$(LIBDAEMON_CFLAGS)
-AM_LDADD+=$(LIBDAEMON_LIBS)
-
-if ENABLE_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
 
@@ -56,8 +49,8 @@ avahi_daemon_SOURCES = \
        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 
+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 \
@@ -75,30 +68,18 @@ service_DATA = \
 pkgdata_DATA = \
        avahi-service.dtd
 
-EXTRA_DIST = \
-       avahi-service.dtd \
-       avahi-daemon.conf \
-       example.service \
-       dbus-test.py \
-       avahi-dbus.conf \
-       Server.introspect \
-       EntryGroup.introspect \
-       DomainBrowser.introspect \
-       ServiceTypeBrowser.introspect \
-       ServiceBrowser.introspect \
-       ssh.service \
-       example.service \
-       introspect.dtd \
-       introspect.xsl
 
-if ENABLE_DBUS
+if HAVE_DBUS
 
 avahi_daemon_SOURCES += \
        dbus-protocol.c \
        dbus-protocol.h
 
 avahi_daemon_LDADD += \
-       ../avahi-common/libdbus-watch-glue.la
+       ../avahi-common/libdbus-watch-glue.la \
+       $(DBUS_LIBS)
+
+avahi_daemon_CFLAGS += $(DBUS_CFLAGS)
 
 dbusservice_DATA = avahi-dbus.conf
 
@@ -110,8 +91,24 @@ introspection_DATA = \
        ServiceBrowser.introspect
 
 endif
+endif
+endif
 
-
+EXTRA_DIST = \
+       avahi-service.dtd \
+       avahi-daemon.conf \
+       example.service \
+       dbus-test.py \
+       avahi-dbus.conf \
+       Server.introspect \
+       EntryGroup.introspect \
+       DomainBrowser.introspect \
+       ServiceTypeBrowser.introspect \
+       ServiceBrowser.introspect \
+       ssh.service \
+       example.service \
+       introspect.dtd \
+       introspect.xsl
 
 xmllint:
        xmllint --noout --valid example.service