Fix make distcheck

diff --git a/configure.ac b/configure.ac
index 8b6d3420898a713084ac7a2e860d7da9d523d8f6..54530e77921cbb34445b554ac77ea4c8ef763e62 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -187,7 +187,6 @@ AC_NETATALK_SENDFILE
 dnl FHS stuff has to be done last because it overrides other defaults
 AC_NETATALK_FHS
 
-LIBS="$LIBS -L\$(top_srcdir)/libatalk"
 CFLAGS="-I\$(top_srcdir)/include -I\$(top_srcdir)/sys $CFLAGS"
 UAMS_PATH="${uams_path}"
 

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 69ccfba1b148f075a222dd0bcd659f0bddbfa1eb..fdd2e58aaa4dc27562a1019b1b001e8b9450aa43 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -50,8 +50,6 @@ afpd_LDADD =  \
 afpd_LDFLAGS = -export-dynamic
 
 afpd_CFLAGS = \
-       -I$(top_srcdir)/include \
-       -I$(top_srcdir)/sys \
        @ZEROCONF_CFLAGS@ @GSSAPI_CFLAGS@ \
        -DAPPLCNAME \
        -DSERVERTEXT=\"$(SERVERTEXT)/\" \

diff --git a/etc/netatalk/Makefile.am b/etc/netatalk/Makefile.am
index a51f9d8fff931365f58657750d5fb02c0546fffd..5897e40f0192e0484361b6bdf47c63bd6ec68d92 100644 (file)
--- a/etc/netatalk/Makefile.am
+++ b/etc/netatalk/Makefile.am
@@ -6,8 +6,8 @@ sbin_PROGRAMS = netatalk
 
 netatalk_SOURCES = netatalk.c
 netatalk_CFLAGS = \
-       -I$(top_srcdir)/include \
        -I$(top_srcdir)/libevent/include \
+       -I$(top_builddir)/libevent/include \
        -D_PATH_CONFDIR=\"$(pkgconfdir)/\" \
        -D_PATH_AFPD=\"$(sbindir)/afpd\" \
        -D_PATH_CNID_METAD=\"$(sbindir)/cnid_metad\"

diff --git a/test/afpd/Makefile.am b/test/afpd/Makefile.am
index a6896718f917ab0d427aa537e5c9dc2e66ffefe1..cb870d0c06813c0b561cc2b5307ae5fe9434ccb6 100644 (file)
--- a/test/afpd/Makefile.am
+++ b/test/afpd/Makefile.am
@@ -10,41 +10,42 @@ 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 \
-                               $(top_builddir)/etc/afpd/afp_util.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 \
-                               $(top_builddir)/etc/afpd/directory.c \
-                               $(top_builddir)/etc/afpd/enumerate.c \
-                               $(top_builddir)/etc/afpd/extattrs.c \
-                               $(top_builddir)/etc/afpd/fce_api.c \
-                               $(top_builddir)/etc/afpd/fce_util.c \
-                               $(top_builddir)/etc/afpd/file.c \
-                               $(top_builddir)/etc/afpd/filedir.c \
-                               $(top_builddir)/etc/afpd/fork.c \
-                               $(top_builddir)/etc/afpd/gettok.c \
-                               $(top_builddir)/etc/afpd/hash.c \
-                               $(top_builddir)/etc/afpd/mangle.c \
-                               $(top_builddir)/etc/afpd/messages.c \
-                               $(top_builddir)/etc/afpd/nfsquota.c \
-                               $(top_builddir)/etc/afpd/ofork.c \
-                               $(top_builddir)/etc/afpd/quota.c \
-                               $(top_builddir)/etc/afpd/status.c \
-                               $(top_builddir)/etc/afpd/switch.c \
-                               $(top_builddir)/etc/afpd/uam.c \
-                               $(top_builddir)/etc/afpd/unix.c \
-                               $(top_builddir)/etc/afpd/volume.c
+                               $(top_srcdir)/etc/afpd/afp_avahi.c \
+                               $(top_srcdir)/etc/afpd/afp_config.c \
+                               $(top_srcdir)/etc/afpd/afp_dsi.c \
+                               $(top_srcdir)/etc/afpd/afp_mdns.c \
+                               $(top_srcdir)/etc/afpd/afp_options.c \
+                               $(top_srcdir)/etc/afpd/afp_util.c \
+                               $(top_srcdir)/etc/afpd/afprun.c \
+                               $(top_srcdir)/etc/afpd/appl.c \
+                               $(top_srcdir)/etc/afpd/auth.c \
+                               $(top_srcdir)/etc/afpd/afp_zeroconf.c \
+                               $(top_srcdir)/etc/afpd/catsearch.c \
+                               $(top_srcdir)/etc/afpd/desktop.c \
+                               $(top_srcdir)/etc/afpd/dircache.c \
+                               $(top_srcdir)/etc/afpd/directory.c \
+                               $(top_srcdir)/etc/afpd/enumerate.c \
+                               $(top_srcdir)/etc/afpd/extattrs.c \
+                               $(top_srcdir)/etc/afpd/fce_api.c \
+                               $(top_srcdir)/etc/afpd/fce_util.c \
+                               $(top_srcdir)/etc/afpd/file.c \
+                               $(top_srcdir)/etc/afpd/filedir.c \
+                               $(top_srcdir)/etc/afpd/fork.c \
+                               $(top_srcdir)/etc/afpd/gettok.c \
+                               $(top_srcdir)/etc/afpd/hash.c \
+                               $(top_srcdir)/etc/afpd/mangle.c \
+                               $(top_srcdir)/etc/afpd/messages.c \
+                               $(top_srcdir)/etc/afpd/nfsquota.c \
+                               $(top_srcdir)/etc/afpd/ofork.c \
+                               $(top_srcdir)/etc/afpd/quota.c \
+                               $(top_srcdir)/etc/afpd/status.c \
+                               $(top_srcdir)/etc/afpd/switch.c \
+                               $(top_srcdir)/etc/afpd/uam.c \
+                               $(top_srcdir)/etc/afpd/unix.c \
+                               $(top_srcdir)/etc/afpd/volume.c
 
 if HAVE_ACLS
-test_SOURCES += $(top_builddir)/etc/afpd/acls.c
+test_SOURCES += $(top_srcdir)/etc/afpd/acls.c
 endif
 
 test_CFLAGS = \