X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-compat-howl%2FMakefile.am;h=bc6714241c892f8e54502b1fc091901095a51a4e;hb=437e85cefb7c4af8db2ff543ae5f8eaece7b3c61;hp=be6bbe9b2abb763c4fbfbbf1e19179a4a5a47cfa;hpb=ed53b44066cd85dd8fc3ed4e8a4c52ae8de365f4;p=catta

diff --git a/avahi-compat-howl/Makefile.am b/avahi-compat-howl/Makefile.am
index be6bbe9..bc67142 100644
--- a/avahi-compat-howl/Makefile.am
+++ b/avahi-compat-howl/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 # This file is part of avahi.
 #
 # avahi is free software; you can redistribute it and/or modify it
@@ -22,7 +20,10 @@ AM_CFLAGS=-I$(top_srcdir)
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
+SUBDIRS = . samples
+
 if HAVE_DBUS
+if ENABLE_COMPAT_HOWL
 
 avahi_compat_howldir=$(includedir)/avahi-compat-howl
 avahi_compat_howl_rendezvousdir=$(avahi_compat_howldir)/rendezvous
@@ -66,58 +67,43 @@ HOWLHEADERS = \
 	$(avahi_compat_howl_discovery_HEADERS) \
 	$(avahi_compat_howl_salt_HEADERS)
 
-lib_LTLIBRARIES = libavahi-compat-howl.la 
+lib_LTLIBRARIES = libhowl.la
 
-noinst_PROGRAMS = address-test text-test samples/browse samples/resolve samples/publish samples/query
+if ENABLE_TESTS
+noinst_PROGRAMS = address-test text-test browse-domain-test
+endif
 
-libavahi_compat_howl_la_SOURCES = \
+libhowl_la_SOURCES = \
 	$(HOWLHEADERS) \
 	warn.c warn.h \
 	unsupported.c \
 	address.c \
 	text.c \
 	compat.c
-libavahi_compat_howl_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
-libavahi_compat_howl_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMPAT_HOWL_VERSION_INFO) $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
+libhowl_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
+libhowl_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_COMPAT_HOWL_VERSION_INFO) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
 
 address_test_SOURCES = \
 	$(HOWLHEADERS) \
 	address.c \
 	address-test.c \
-	warn.c warn.h 
+	warn.c warn.h
 address_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
-address_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
+address_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la
 
 text_test_SOURCES = \
 	$(HOWLHEADERS) \
 	text.c \
 	text-test.c \
-	warn.c warn.h 
-text_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
-text_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
-
-samples_browse_SOURCES = \
-	$(HOWLHEADERS) \
-	samples/browse.c
-samples_browse_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
-samples_browse_LDADD = $(AM_LDADD) libavahi-compat-howl.la
+	warn.c warn.h
+text_test_CFLAGS = $(AM_CFLAGS)  $(PTHREAD_CFLAGS) -I $(srcdir)/include
+text_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la
 
-samples_resolve_SOURCES = \
+browse_domain_test_SOURCES = \
 	$(HOWLHEADERS) \
-	samples/resolve.c
-samples_resolve_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
-samples_resolve_LDADD = $(AM_LDADD) libavahi-compat-howl.la
-
-samples_publish_SOURCES = \
-	$(HOWLHEADERS) \
-	samples/publish.c
-samples_publish_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
-samples_publish_LDADD = $(AM_LDADD) libavahi-compat-howl.la
-
-samples_query_SOURCES = \
-	$(HOWLHEADERS) \
-	samples/query.c
-samples_query_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
-samples_query_LDADD = $(AM_LDADD) libavahi-compat-howl.la
+	browse-domain-test.c
+browse_domain_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
+browse_domain_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) libhowl.la
 
 endif
+endif