* Don't build libavahi-compat-howl.so anymore, just libhowl.so.

* Same for libdns_sd.so

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1018 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-compat-howl.pc.in b/avahi-compat-howl.pc.in
index 0a42903eafb86396c821309c021bedd458610983..ceeef59f622445a00c4d61a16a7359f921e31ece 100644 (file)
--- a/avahi-compat-howl.pc.in
+++ b/avahi-compat-howl.pc.in
@@ -6,5 +6,5 @@ includedir=${prefix}/include/avahi-compat-howl/
 Name: avahi-compat-howl
 Description: Avahi Multicast DNS Responder (HOWL Compatibility)
 Version: @HOWL_COMPAT_VERSION@
-Libs: -L${libdir} -lavahi-compat-howl
+Libs: -L${libdir} -lhowl
 Cflags: -D_REENTRANT -I${includedir}

diff --git a/avahi-compat-howl/Makefile.am b/avahi-compat-howl/Makefile.am
index 754ecd341ba09f279edc5f6b9c8ce1182ef7a1ad..f324bab08963947186b12c1cc01e29a3cf6c4991 100644 (file)
--- a/avahi-compat-howl/Makefile.am
+++ b/avahi-compat-howl/Makefile.am
@@ -69,25 +69,21 @@ HOWLHEADERS = \
        $(avahi_compat_howl_discovery_HEADERS) \
        $(avahi_compat_howl_salt_HEADERS)
 
-lib_LTLIBRARIES = libavahi-compat-howl.la libhowl.la
+lib_LTLIBRARIES = libhowl.la
 
 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_SOURCES =
-libhowl_la_CFLAGS = $(AM_CFLAGS)
-libhowl_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMPAT_HOWL_VERSION_INFO) libavahi-compat-howl.la
+libhowl_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
+libhowl_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
 
 address_test_SOURCES = \
        $(HOWLHEADERS) \
@@ -109,7 +105,7 @@ browse_domain_test_SOURCES = \
        $(HOWLHEADERS) \
        browse-domain-test.c
 browse_domain_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
-browse_domain_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) libavahi-compat-howl.la
+browse_domain_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) libhowl.la
 
 endif
 endif

diff --git a/avahi-compat-howl/samples/Makefile.am b/avahi-compat-howl/samples/Makefile.am
index 21d15a8af7dba03f2ae8a7a74c044dd6b54ba6c8..bda07b182694492caa3a0f4371c3901f8dee5b88 100644 (file)
--- a/avahi-compat-howl/samples/Makefile.am
+++ b/avahi-compat-howl/samples/Makefile.am
@@ -32,22 +32,22 @@ endif
 browse_SOURCES = \
        browse.c
 browse_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
-browse_LDADD = $(AM_LDADD) ../libavahi-compat-howl.la
+browse_LDADD = $(AM_LDADD) ../libhowl.la
 
 resolve_SOURCES = \
        resolve.c
 resolve_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
-resolve_LDADD = $(AM_LDADD) ../libavahi-compat-howl.la
+resolve_LDADD = $(AM_LDADD) ../libhowl.la
 
 publish_SOURCES = \
        publish.c
 publish_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
-publish_LDADD = $(AM_LDADD) ../libavahi-compat-howl.la
+publish_LDADD = $(AM_LDADD) ../libhowl.la
 
 query_SOURCES = \
        query.c
 query_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
-query_LDADD = $(AM_LDADD) ../libavahi-compat-howl.la
+query_LDADD = $(AM_LDADD) ../libhowl.la
 
 endif
 endif

diff --git a/avahi-compat-libdns_sd.pc.in b/avahi-compat-libdns_sd.pc.in
index 3007578745270bb977894dea9086d02dfc2f1ea1..9c170ba4345b7a8ed0931db6499d2507240a4087 100644 (file)
--- a/avahi-compat-libdns_sd.pc.in
+++ b/avahi-compat-libdns_sd.pc.in
@@ -6,5 +6,5 @@ includedir=${prefix}/include/avahi-compat-libdns_sd/
 Name: avahi-compat-libdns_sd
 Description: Avahi Multicast DNS Responder (libdns_sd Compatibility)
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lavahi-compat-libdns_sd
+Libs: -L${libdir} -ldns_sd
 Cflags: -D_REENTRANT -I${includedir}

diff --git a/avahi-compat-libdns_sd/Makefile.am b/avahi-compat-libdns_sd/Makefile.am
index 1085c7724858197fde0436fd18c0cd57fe558a78..acd723b37093a778c477243a2d3cd6bd58cee44e 100644 (file)
--- a/avahi-compat-libdns_sd/Makefile.am
+++ b/avahi-compat-libdns_sd/Makefile.am
@@ -29,24 +29,20 @@ avahi_compat_libdns_sddir=$(includedir)/avahi-compat-libdns_sd
 
 avahi_compat_libdns_sd_HEADERS = dns_sd.h
 
-lib_LTLIBRARIES = libavahi-compat-libdns_sd.la libdns_sd.la
+lib_LTLIBRARIES = libdns_sd.la
 
 if ENABLE_TESTS
 noinst_PROGRAMS = txt-test
 endif
 
-libavahi_compat_libdns_sd_la_SOURCES = \
+libdns_sd_la_SOURCES = \
        dns_sd.h \
        compat.c \
        txt.c \
        unsupported.c \
        warn.c warn.h
-libavahi_compat_libdns_sd_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-libavahi_compat_libdns_sd_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO) $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
-
-libdns_sd_la_SOURCES =
-libdns_sd_la_CFLAGS = $(AM_CFLAGS)
-libdns_sd_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO) libavahi-compat-libdns_sd.la
+libdns_sd_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
+libdns_sd_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO) $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
 
 txt_test_SOURCES = \
        dns_sd.h \
@@ -61,9 +57,9 @@ txt_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la
 # libdns_sd-test" manually. We do not distribute that file due to
 # licensing restrictions.
 
-libdns_sd-test: libdns_sd-test.c libavahi-compat-libdns_sd.la
+libdns_sd-test: libdns_sd-test.c libdns_sd.la
        $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test.o -c libdns_sd-test.c 
-       $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test libdns_sd-test.o $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la libavahi-compat-libdns_sd.la 
+       $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test libdns_sd-test.o $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la libdns_sd.la 
 
 CLEANFILES = libdns_sd-test.o libdns_sd-test