Merge from branch 2-1

[netatalk.git] / test / afpd / Makefile.am

diff --git a/test/afpd/Makefile.am b/test/afpd/Makefile.am
index e8264cc719ed0d07704598804277664a0c605b38..2bb6b3e9d56b9c81047602a37ca197f8b96c77fe 100644 (file)
--- a/test/afpd/Makefile.am
+++ b/test/afpd/Makefile.am
@@ -6,8 +6,11 @@ TESTS = test.sh test
 
 check_PROGRAMS = test
 noinst_HEADERS = test.h subtests.h afpfunc_helpers.h
+EXTRA_DIST = test.sh
+CLEANFILES = test.default test.conf
 
 test_SOURCES =  test.c subtests.c afpfunc_helpers.c \
+                               $(top_builddir)/etc/afpd/afp_avahi.c \
                                $(top_builddir)/etc/afpd/afp_config.c \
                                $(top_builddir)/etc/afpd/afp_dsi.c \
                                $(top_builddir)/etc/afpd/afp_options.c \
@@ -15,6 +18,7 @@ test_SOURCES =  test.c subtests.c afpfunc_helpers.c \
                                $(top_builddir)/etc/afpd/afprun.c \
                                $(top_builddir)/etc/afpd/appl.c \
                                $(top_builddir)/etc/afpd/auth.c \
+                               $(top_builddir)/etc/afpd/afp_zeroconf.c \
                                $(top_builddir)/etc/afpd/catsearch.c \
                                $(top_builddir)/etc/afpd/desktop.c \
                                $(top_builddir)/etc/afpd/dircache.c \
@@ -37,8 +41,14 @@ test_SOURCES =  test.c subtests.c afpfunc_helpers.c \
                                $(top_builddir)/etc/afpd/unix.c \
                                $(top_builddir)/etc/afpd/volume.c
 
+if HAVE_ACLS
+test_SOURCES += $(top_builddir)/etc/afpd/acls.c
+endif
+
 test_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/etc/afpd \
-        @SLP_CFLAGS@ \
+        @SLP_CFLAGS@ @ZEROCONF_CFLAGS@ \
+        -DAPPLCNAME \
+        -DSERVERTEXT=\"$(SERVERTEXT)/\" \
         -D_PATH_AFPDDEFVOL=\"$(pkgconfdir)/AppleVolumes.default\" \
         -D_PATH_AFPDSYSVOL=\"$(pkgconfdir)/AppleVolumes.system\" \
         -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\" \
@@ -46,11 +56,10 @@ test_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/etc/afpd \
         -D_PATH_AFPDUAMPATH=\"$(UAMS_PATH)/\" \
         -D_PATH_ACL_LDAPCONF=\"$(pkgconfdir)/afp_ldap.conf\" \
         -D_PATH_AFPDSIGCONF=\"$(pkgconfdir)/afp_signature.conf\" \
-        -DAPPLCNAME \
-        -DSERVERTEXT=\"$(SERVERTEXT)/\"
+        -D_PATH_AFPDUUIDCONF=\"$(pkgconfdir)/afp_voluuid.conf\"
 
 test_LDADD = $(top_builddir)/libatalk/cnid/libcnid.la \
        $(top_builddir)/libatalk/libatalk.la \
-       @QUOTA_LIBS@ @SLP_LIBS@ @WRAP_LIBS@ @LIBADD_DL@
+       @QUOTA_LIBS@ @SLP_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @ZEROCONF_LIBS@ @PTHREAD_LIBS@
 
 test_LDFLAGS = -export-dynamic