Fix make check and beautify afpd_SOURCES

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 5d00b9ed4db4a3f1a02b7571653e37a1063c7f70..7e93dec2b5b42ab59c6de70dcc5bb2a03914ddb1 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -5,29 +5,63 @@ 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 hash.c extattrs.c dircache.c \
-       afp_zeroconf.c afp_avahi.c
-
-afpd_LDADD =  $(top_builddir)/libatalk/cnid/libcnid.la \
+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
+
+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_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\" \
-        -D_PATH_AFPDUUIDCONF=\"$(pkgconfdir)/afp_voluuid.conf\" \
-        -DAPPLCNAME \
-        -DSERVERTEXT=\"$(SERVERTEXT)/\"
+
+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\"
 
 if HAVE_ACLS
 afpd_SOURCES += acls.c

diff --git a/test/afpd/Makefile.am b/test/afpd/Makefile.am
index bbd1c110ce0f04260f53aad249e9a5be657b5a1e..2bb6b3e9d56b9c81047602a37ca197f8b96c77fe 100644 (file)
--- a/test/afpd/Makefile.am
+++ b/test/afpd/Makefile.am
@@ -10,6 +10,7 @@ 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 \
@@ -17,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 \
@@ -39,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\" \
@@ -48,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