X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2FMakefile.am;h=79d062f6895d483848ff0a6cc5e209edfdf04b89;hb=e5f8b9380b9cb893dbb3449c7b1635e256752591;hp=96ef099d7fbe2f8c6895fb9274ab53e9cdb4f67f;hpb=ee448b6e8d7c0ae4a01f0c3d062368fb55839d67;p=catta

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index 96ef099..79d062f 100644
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -1,7 +1,5 @@
-# $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
@@ -48,11 +46,12 @@ noinst_PROGRAMS = \
 	alternative-test \
 	timeval-test \
 	watch-test \
-	watch-test-thread
+	watch-test-thread \
+	utf8-test
 endif
 
 lib_LTLIBRARIES = \
-	libavahi-common.la 
+	libavahi-common.la
 
 libavahi_common_la_SOURCES = \
 	malloc.c malloc.h \
@@ -65,11 +64,13 @@ libavahi_common_la_SOURCES = \
 	simple-watch.c simple-watch.h \
 	thread-watch.c thread-watch.h \
 	watch.h gccmacro.h \
-	rlist.h rlist.c
+	rlist.h rlist.c \
+	utf8.c utf8.h \
+	i18n.c i18n.h
 
-libavahi_common_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) 
-libavahi_common_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
-libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMMON_VERSION_INFO)
+libavahi_common_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -DAVAHI_LOCALEDIR=\"$(avahilocaledir)\"
+libavahi_common_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(INTLLIBS)
+libavahi_common_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_COMMON_VERSION_INFO)
 
 strlst_test_SOURCES = \
 	strlst.c strlst.h \
@@ -81,13 +82,17 @@ alternative_test_SOURCES = \
 	alternative.c alternative.h \
 	malloc.c malloc.h \
 	domain.c domain.h \
-	alternative-test.c
+	address.c address.h \
+	alternative-test.c \
+	utf8.c utf8.h
 alternative_test_CFLAGS = $(AM_CFLAGS)
 
 domain_test_SOURCES = \
 	domain.c domain.h \
 	malloc.c malloc.h \
-	domain-test.c
+	address.c address.h \
+	domain-test.c \
+	utf8.c utf8.h
 domain_test_CFLAGS = $(AM_CFLAGS)
 
 watch_test_SOURCES = \
@@ -109,6 +114,12 @@ timeval_test_SOURCES = \
 timeval_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 timeval_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS)
 
+utf8_test_SOURCES = \
+	utf8-test.c \
+	utf8.c utf8.h
+utf8_test_CFLAGS = $(AM_CFLAGS)
+utf8_test_LDADD = $(AM_LDADD)
+
 if HAVE_DBUS
 
 noinst_HEADERS = \
@@ -116,4 +127,3 @@ noinst_HEADERS = \
 	dbus-watch-glue.h
 
 endif
-