Merge from branch-2-1

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

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 1f13c62d493f62aea7b4fcc03fc32c82f02adbc7..7e93dec2b5b42ab59c6de70dcc5bb2a03914ddb1 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -1,39 +1,77 @@
 # Makefile.am for etc/afpd/
 
 pkgconfdir = @PKGCONFDIR@
-nlsdir = @NLSDIR@
-
-SUBDIRS = nls
 
 sbin_PROGRAMS = afpd
+noinst_PROGRAMS = hash
+
+afpd_SOURCES = \
+       afp_asp.c \
+       afp_avahi.c \
+       afp_config.c \
+       afp_dsi.c \
+       afp_options.c \
+       afp_util.c \
+       afp_zeroconf.c \
+       afprun.c \
+       afs.c \
+       appl.c \
+       auth.c \
+       catsearch.c \
+       desktop.c \
+       dircache.c \
+       directory.c \
+       enumerate.c \
+       extattrs.c \
+       file.c \
+       filedir.c \
+       fork.c \
+       gettok.c \
+       hash.c \
+       main.c \
+       mangle.c \
+       messages.c  \
+       nfsquota.c \
+       ofork.c \
+       quota.c \
+       status.c \
+       switch.c \
+       uam.c \
+       uid.c \
+       unix.c \
+       volume.c
 
-bin_PROGRAMS = test_parse_mtab
+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@
 
-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 \
-        status.c afp_options.c afp_asp.c afp_dsi.c messages.c afp_config.c \
-        nfsquota.c codepage.c quota.c uam.c afs.c uid.c parse_mtab.c \
-        afp_util.c
+afpd_LDFLAGS = -export-dynamic 
 
-test_parse_mtab_SOURCES = test_parse_mtab.c parse_mtab.c
-test_parse_mtab_LDADD = $(top_builddir)/libatalk/libatalk.la
+afpd_CFLAGS = \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/sys \
+       @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\"
 
-afpd_LDADD = $(top_builddir)/libatalk/libatalk.la
-afpd_LDFLAGS = -export-dynamic
+if HAVE_ACLS
+afpd_SOURCES += acls.c
+endif
 
-noinst_HEADERS = auth.h codepage.h afp_config.h desktop.h directory.h file.h \
-        filedir.h fork.h globals.h icon.h misc.h status.h switch.h uam_auth.h \
-        uid.h unix.h volume.h parse_mtab.h
 
-LIBS = @LIBS@ @AFPD_LIBS@ @QUOTA_LIBS@ @SLP_LIBS@
+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 hash.h acls.h acl_mappings.h extattrs.h \
+        dircache.h afp_zeroconf.h afp_avahi.h
 
-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_AFPDNLSPATH=\"$(nlsdir)/\" \
-        -DAFPD_MTAB_FILE=\"$(pkgconfdir)/afpd.mtab\" \
-        -DAPPLCNAME
+hash_SOURCES = hash.c
+hash_CFLAGS = -DKAZLIB_TEST_MAIN -I$(top_srcdir)/include