First patch import

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

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index ad641229a94ef40626b8c7ec52ed576af137433c..f539d899d7a5506ca0f136ccc539e7e75be89efc 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -3,33 +3,40 @@
 pkgconfdir = @PKGCONFDIR@
 
 sbin_PROGRAMS = afpd
+noinst_PROGRAMS = hash
 
 afpd_SOURCES = unix.c ofork.c main.c switch.c auth.c volume.c directory.c \
         file.c enumerate.c desktop.c filedir.c fork.c appl.c gettok.c \
         mangle.c status.c afp_options.c afp_asp.c afp_dsi.c messages.c  \
         afp_config.c nfsquota.c quota.c uam.c afs.c uid.c afp_util.c \
-         catsearch.c afprun.c vfs_adouble.c hash.c
+       catsearch.c afprun.c hash.c extattrs.c dircache.c \
+       afp_zeroconf.c afp_avahi.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@
+afpd_LDFLAGS = -export-dynamic 
+afpd_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys \
+        @SLP_CFLAGS@ @ZEROCONF_CFLAGS@ \
+        -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\" \
+        -DAPPLCNAME \
+        -DSERVERTEXT=\"$(SERVERTEXT)/\"
 
-if USE_NFSv4_ACLS
+if HAVE_ACLS
 afpd_SOURCES += acls.c
 endif
 
-afpd_LDADD =  $(top_builddir)/libatalk/cnid/libcnid.la $(top_builddir)/libatalk/libatalk.la
-afpd_LDFLAGS = -export-dynamic
 
 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 \
-        uam_auth.h uid.h unix.h volume.h afp_vfs.h hash.h acls.h acl_mappings.h
-
-LIBS = @LIBS@ @QUOTA_LIBS@ @SLP_LIBS@ @WRAP_LIBS@ @LIBADD_DL@
+        uam_auth.h uid.h unix.h volume.h hash.h acls.h acl_mappings.h extattrs.h \
+        dircache.h
 
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys \
-        @CFLAGS@ @SLP_CFLAGS@ \
-        -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_AFPDUAMPATH=\"$(UAMS_PATH)/\" \
-        -D_PATH_ACL_LDAPCONF=\"$(pkgconfdir)/ldap.conf\" \
-        -DAPPLCNAME \
-        -DSERVERTEXT=\"$(SERVERTEXT)/\"
+hash_SOURCES = hash.c
+hash_CFLAGS = -DKAZLIB_TEST_MAIN -I$(top_srcdir)/include