Merge branch 'release-3-0-alpha2'

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

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 7e93dec2b5b42ab59c6de70dcc5bb2a03914ddb1..85b51dc86bdca8971ecb85ce94c66c1273c28e21 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -3,13 +3,13 @@
 pkgconfdir = @PKGCONFDIR@
 
 sbin_PROGRAMS = afpd
-noinst_PROGRAMS = hash
+noinst_PROGRAMS = hash fce
 
 afpd_SOURCES = \
-       afp_asp.c \
        afp_avahi.c \
        afp_config.c \
        afp_dsi.c \
+       afp_mdns.c \
        afp_options.c \
        afp_util.c \
        afp_zeroconf.c \
@@ -23,6 +23,8 @@ afpd_SOURCES = \
        directory.c \
        enumerate.c \
        extattrs.c \
+       fce_api.c \
+       fce_util.c \
        file.c \
        filedir.c \
        fork.c \
@@ -42,36 +44,33 @@ afpd_SOURCES = \
        volume.c
 
 afpd_LDADD =  \
-       $(top_builddir)/libatalk/cnid/libcnid.la \
        $(top_builddir)/libatalk/libatalk.la \
-       @QUOTA_LIBS@ @SLP_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @ZEROCONF_LIBS@ @PTHREAD_LIBS@
+       @LIBGCRYPT_LIBS@ @QUOTA_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @ZEROCONF_LIBS@ @PTHREAD_LIBS@ @GSSAPI_LIBS@ @KRB5_LIBS@
 
-afpd_LDFLAGS = -export-dynamic 
+afpd_LDFLAGS = -export-dynamic
 
 afpd_CFLAGS = \
-       -I$(top_srcdir)/include \
-       -I$(top_srcdir)/sys \
-       @SLP_CFLAGS@ @ZEROCONF_CFLAGS@ \
+       @ZEROCONF_CFLAGS@ @GSSAPI_CFLAGS@ @KRB5_CFLAGS@\
        -DAPPLCNAME \
        -DSERVERTEXT=\"$(SERVERTEXT)/\" \
-       -D_PATH_AFPDDEFVOL=\"$(pkgconfdir)/AppleVolumes.default\" \
-       -D_PATH_AFPDSYSVOL=\"$(pkgconfdir)/AppleVolumes.system\" \
        -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\" \
-       -D_PATH_AFPDCONF=\"$(pkgconfdir)/afpd.conf\" \
-       -D_PATH_AFPDSIGCONF=\"$(pkgconfdir)/afp_signature.conf\" \
        -D_PATH_AFPDUAMPATH=\"$(UAMS_PATH)/\" \
-       -D_PATH_ACL_LDAPCONF=\"$(pkgconfdir)/afp_ldap.conf\" \
-       -D_PATH_AFPDUUIDCONF=\"$(pkgconfdir)/afp_voluuid.conf\"
+       -D_PATH_CONFDIR=\"$(pkgconfdir)/\" \
+       -D_PATH_STATEDIR='"$(localstatedir)/netatalk/"'
 
 if HAVE_ACLS
 afpd_SOURCES += acls.c
 endif
 
 
-noinst_HEADERS = auth.h afp_config.h desktop.h directory.h file.h \
-        filedir.h fork.h globals.h icon.h mangle.h misc.h status.h switch.h \
+noinst_HEADERS = auth.h afp_config.h desktop.h directory.h fce_api_internal.h file.h \
+        filedir.h fork.h icon.h mangle.h misc.h status.h switch.h \
         uam_auth.h uid.h unix.h volume.h hash.h acls.h acl_mappings.h extattrs.h \
-        dircache.h afp_zeroconf.h afp_avahi.h
+        dircache.h afp_zeroconf.h afp_avahi.h afp_mdns.h
 
 hash_SOURCES = hash.c
 hash_CFLAGS = -DKAZLIB_TEST_MAIN -I$(top_srcdir)/include
+
+fce_SOURCES = fce_api.c fce_util.c
+fce_CFLAGS = -DFCE_TEST_MAIN -I$(top_srcdir)/include
+fce_LDADD = $(top_builddir)/libatalk/libatalk.la