New option parsing

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

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 35580d93e599f84943f7fc8beda2baf7952de336..1a2dd95c40087af4b0a1355ed057e2518430e255 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -6,7 +6,6 @@ sbin_PROGRAMS = afpd
 noinst_PROGRAMS = hash fce
 
 afpd_SOURCES = \
-       afp_asp.c \
        afp_avahi.c \
        afp_config.c \
        afp_dsi.c \
@@ -46,9 +45,9 @@ afpd_SOURCES = \
 afpd_LDADD =  \
        $(top_builddir)/libatalk/cnid/libcnid.la \
        $(top_builddir)/libatalk/libatalk.la \
-       @LIBGCRYPT_LIBS@ @ZEROCONF_LIBS@ @QUOTA_LIBS@ @SLP_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @PTHREAD_LIBS@
+       @LIBGCRYPT_LIBS@ @QUOTA_LIBS@ @SLP_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @ZEROCONF_LIBS@ @PTHREAD_LIBS@
 
-afpd_LDFLAGS = -export-dynamic 
+afpd_LDFLAGS = -export-dynamic
 
 afpd_CFLAGS = \
        -I$(top_srcdir)/include \
@@ -56,14 +55,12 @@ afpd_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\" \
        -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_AFPDUUIDCONF=\"$(pkgconfdir)/afp_voluuid.conf\" \
+       -D_PATH_CONFDIR=\"$(pkgconfdir)\"
 
 if HAVE_ACLS
 afpd_SOURCES += acls.c
@@ -71,7 +68,7 @@ endif
 
 
 noinst_HEADERS = auth.h afp_config.h desktop.h directory.h fce_api_internal.h file.h \
-        filedir.h fork.h globals.h icon.h mangle.h misc.h status.h switch.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