# USA.
EXTRA_DIST = bootstrap.sh LICENSE doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in libtool.m4
-SUBDIRS = avahi-core avahi-discover
+SUBDIRS = avahi-common avahi-core avahi-discover
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = avahi-core.pc
--- /dev/null
+# $Id: Makefile.am 90 2005-05-23 16:15:12Z lennart $
+#
+# This file is part of avahi.
+#
+# avahi is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# avahi is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with avahi; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
+
+AM_CFLAGS=-I$(top_srcdir) -D_GNU_SOURCE
+
+# GLIB 2.0
+AM_CFLAGS+=$(GLIB20_CFLAGS)
+AM_LDADD=$(GLIB20_LIBS)
+
+# This cool debug trap works on i386/gcc only
+AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
+
+avahi_commonincludedir=$(includedir)/avahi-common
+
+avahi_commoninclude_HEADERS =
+ strlst.h \
+ address.h \
+ alternative.h \
+ rr.h \
+ util.h \
+ dns.h
+
+noinst_PROGRAMS = \
+ strlst-test \
+ dns-test \
+ domain-test \
+ alternative-test
+
+lib_LTLIBRARIES = \
+ libavahi-common.la
+
+libavahi_common_la_SOURCES = \
+ address.c address.h \
+ strlst.c strlst.h \
+ alternative.c alternative.h \
+ rr.c rr.h \
+ dns.c dns.h \
+ util.c util.h
+
+strlst_test_SOURCES = \
+ strlst.c strlst.h \
+ strlst-test.c
+strlst_test_CFLAGS = $(AM_CFLAGS)
+strlst_test_LDADD = $(AM_LDADD)
+
+dns_test_SOURCES = \
+ util.c util.h \
+ dns.c dns.h \
+ rr.c rr.h \
+ strlst.c strlst \
+ dns-test.c
+dns_test_CFLAGS = $(AM_CFLAGS)
+dns_test_LDADD = $(AM_LDADD)
+
+alternative_test_SOURCES = \
+ alternative.c alternative.h \
+ alternative-test.c
+alternative_test_CFLAGS = $(AM_CFLAGS)
+alternative_test_LDADD = $(AM_LDADD)
+
+domain_test_SOURCES = \
+ util.c util.h \
+ domain-test.c
+domain_test_CFLAGS = $(AM_CFLAGS)
+domain_test_LDADD = $(AM_LDADD)
#include <glib.h>
-#include <avahi-core/strlst.h>
-#include <avahi-core/address.h>
+#include <avahi-common/strlst.h>
+#include <avahi-common/address.h>
enum {
AVAHI_DNS_TYPE_A = 0x01,
Name: avahi-core
Description: Avahi Embeddable Multicast DNS Engine
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lavahi-core
+Libs: -L${libdir} -lavahi-core -lavahi-common
Cflags: -D_REENTRANT -I${includedir}
# GLIB 2.0
AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD=$(GLIB20_LIBS)
+AM_LDADD=$(GLIB20_LIBS) ../avahi-common/libavahi-common.la
+
+AM_CFLAGS+=-I$(top_srcdir)/avahi-common
# This cool debug trap works on i386/gcc only
AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
-avahiincludedir=$(includedir)/avahi-core
+avahiincludedir=$(includedir)/avahi-core
-avahiinclude_HEADERS = \
- rr.h \
- address.h \
- strlst.h \
- core.h \
- alternative.h
+avahiinclude_HEADERS =
+ core.h
lib_LTLIBRARIES = \
libavahi-core.la
noinst_PROGRAMS = \
- dns-test \
- domain-test \
prioq-test \
- strlst-test \
avahi-test \
- alternative-test \
conformance-test \
avahi-reflector
iface.c iface.h \
netlink.c netlink.h \
server.c server.h \
- address.c address.h \
- util.c util.h \
prioq.c prioq.h \
cache.c cache.h\
- rr.c rr.h \
- dns.c dns.h \
socket.c socket.h \
response-sched.c response-sched.h \
query-sched.c query-sched.h \
probe-sched.c probe-sched.h \
announce.c announce.h \
browse.c browse.h \
- strlst.c strlst.h \
rrlist.c rrlist.h \
- alternative.c alternative.h \
resolve-host-name.c \
resolve-address.c \
browse-domain.c \
prioq_test_CFLAGS = $(AM_CFLAGS)
prioq_test_LDADD = $(AM_LDADD)
-strlst_test_SOURCES = \
- strlst-test.c \
- strlst.c strlst.h
-strlst_test_CFLAGS = $(AM_CFLAGS)
-strlst_test_LDADD = $(AM_LDADD)
-
-domain_test_SOURCES = \
- domain-test.c \
- util.c util.h
-domain_test_CFLAGS = $(AM_CFLAGS)
-domain_test_LDADD = $(AM_LDADD)
-
-dns_test_SOURCES = \
- dns-test.c \
- util.c util.h \
- dns.c dns.h \
- rr.c rr.h \
- strlst.c strlst.h
-dns_test_CFLAGS = $(AM_CFLAGS)
-dns_test_LDADD = $(AM_LDADD)
-
avahi_test_SOURCES = \
avahi-test.c \
$(libavahi_core_la_SOURCES)
avahi_test_CFLAGS = $(AM_CFLAGS)
avahi_test_LDADD = $(AM_LDADD)
-alternative_test_SOURCES = \
- alternative-test.c \
- alternative.c alternative.h
-alternative_test_CFLAGS = $(AM_CFLAGS)
-alternative_test_LDADD = $(AM_LDADD)
-
conformance_test_SOURCES = \
conformance-test.c \
$(libavahi_core_la_SOURCES)
#include <stdlib.h>
#include <avahi-core/core.h>
-#include <avahi-core/alternative.h>
int main(int argc, char*argv[]) {
AvahiServer *server;
#include <stdlib.h>
#include <avahi-core/core.h>
-#include <avahi-core/alternative.h>
static AvahiEntryGroup *group = NULL;
static AvahiServer *server = NULL;
/** A group of locally registered DNS RRs */
typedef struct AvahiEntryGroup AvahiEntryGroup;
-#include <avahi-core/address.h>
-#include <avahi-core/rr.h>
+#include <avahi-common/address.h>
+#include <avahi-common/rr.h>
+#include <avahi-common/alternative.h>
/** States of a server object */
typedef enum {
main.c
avahi_discover_CFLAGS = $(AM_CFLAGS)
-avahi_discover_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la
+avahi_discover_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la
#include <gtk/gtk.h>
#include <glade/glade.h>
#include <avahi-core/core.h>
-#include <avahi-core/strlst.h>
+#include <avahi-common/strlst.h>
struct ServiceType;
rm -f conftest.o
fi
-AC_CONFIG_FILES([Makefile avahi-core.pc doxygen/Makefile doxygen/doxygen.conf avahi-core/Makefile daemon/Makefile avahi-discover/Makefile])
+AC_CONFIG_FILES([Makefile avahi-core.pc doxygen/Makefile doxygen/doxygen.conf avahi-common/Makefile avahi-core/Makefile daemon/Makefile avahi-discover/Makefile])
AC_OUTPUT
main.c
avahi_CFLAGS = $(AM_CFLAGS)
-avahi_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la
-
-
+avahi_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = ../avahi-core/core.h ../avahi-core/address.h ../avahi-core/rr.h ../avahi-core/strlst.h ../avahi-core/alternative.h
+INPUT = ../avahi-core/core.h ../avahi-common/address.h ../avahi-common/rr.h ../avahi-common/strlst.h ../avahi-common/alternative.h
# If the value of the INPUT tag contains directories, you can use the
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp