removing -latalk, since it is unneeded and sometimes causes errors

diff --git a/config/Makefile.am b/config/Makefile.am
index 64e52a2e2711612efa6e6f67027c48715b006c5f..201b0b7c7a114e2e74d3f61ec54eff71ab3e7f73 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -16,6 +16,16 @@ config_DATA = AppleVolumes.default AppleVolumes.system afpd.conf atalkd.conf net
 
 EXTRA_DIST = $(config_DATA)
 
+#
+# pluggable authentication modules check for shadow password support
+#
+
+if USE_SHADOWPW
+PAMD = netatalk.pamd.shadow
+else
+PAMD = netatalk.pamd
+endif
+
 #
 # pluggable authentication modules support?
 #
@@ -23,10 +33,9 @@ EXTRA_DIST = $(config_DATA)
 if USE_PAM
 
 pamdir    = /etc/pam.d
-
 pam_DATA = netatalk
 
 netatalk:
-       cp -f netatalk.pamd netatalk
+       $(CP) -f $(PAMD) netatalk
 
 endif 

diff --git a/contrib/timelord/Makefile.am b/contrib/timelord/Makefile.am
index 757c6bfbce2725a1327fbd0580f7c9aff69e11ca..b5926952688703a5541471670d3a78d3d49e005c 100644 (file)
--- a/contrib/timelord/Makefile.am
+++ b/contrib/timelord/Makefile.am
@@ -5,6 +5,6 @@ sbin_PROGRAMS = timelord
 timelord_SOURCES = timelord.c
 timelord_LDADD = $(top_builddir)/libatalk/libatalk.la
 
-LIBS = @LIBS@ -latalk
+LIBS = @LIBS@
 
 EXTRA_DIST = COPYRIGHT README VERSION

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 2ab57509078a85edb4b43419a86508cab60717e9..c911e890821d48818b5a2db97c9872b41f4d6e46 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -5,11 +5,11 @@ SUBDIRS = nls
 sbin_PROGRAMS = afpd
 
 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
+        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
 
-afpd_LDADD = $(top_builddir)/libatalk/libatalk.a -latalk
+afpd_LDADD = $(top_builddir)/libatalk/libatalk.la
 afpd_LDFLAGS = -rdynamic
 
 noinst_HEADERS = auth.h codepage.h afp_config.h desktop.h directory.h file.h \

diff --git a/etc/papd/Makefile.am b/etc/papd/Makefile.am
index bdd76f2513c54d8b05bc633a8f3ebd7ce80b9e18..81fa7a8620be4a830a72b0575f8e132665987c7f 100644 (file)
--- a/etc/papd/Makefile.am
+++ b/etc/papd/Makefile.am
@@ -3,12 +3,13 @@
 sbin_PROGRAMS = papd
 #bin_PROGRAMS = showppd
 
-papd_SOURCES = main.c printcap.c session.c file.c comment.c lp.c ppd.c magics.c headers.c queries.c auth.c uam.c
-papd_LDADD = $(top_builddir)/libatalk/libatalk.la -latalk
+papd_SOURCES = main.c printcap.c session.c file.c comment.c lp.c ppd.c \
+       magics.c headers.c queries.c auth.c uam.c
+papd_LDADD = $(top_builddir)/libatalk/libatalk.la
 papd_LDFLAGS = -rdynamic
 
 #showppd_SOURCES = showppd.c ppd.c
-#showppd_LDADD = $(top_builddir)/libatalk/libatalk.la -latalk
+#showppd_LDADD = $(top_builddir)/libatalk/libatalk.la
 
 noinst_HEADERS = comment.h file.h ppd.h printer.h uam_auth.h
 

diff --git a/etc/psf/Makefile.am b/etc/psf/Makefile.am
index a5babf2055150e2c38950871ab5f1eee185e2e44..513a6b27012b27073cf0f355d7c8c3e16ce18a0c 100644 (file)
--- a/etc/psf/Makefile.am
+++ b/etc/psf/Makefile.am
@@ -34,4 +34,4 @@ install-data-local:
 #
 
 clean distclean clean-recursive distclean-recursive:
-       $(RM) $(psf_LINKS) *.o core .libs .deps
+       $(RM) -r $(psf_LINKS) *.o core .libs .deps