Makefile.am patches from Sebastian Rittau (srittau@jroger.in-berlin.de)

diff --git a/Makefile.am b/Makefile.am
index 6d847bab9bcf61d1e3d0971628a8426d8b86c5d2..c79763aeb2ebce01e114f5f8955ff1b1cb40be8b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile.am for top level of netatalk package
 
-SUBDIRS = libatalk bin config etc man contrib distrib
+SUBDIRS = libatalk bin config etc man contrib distrib include sys
 # these later : include
 
 EXTRA_DIST = BUGS CHANGES CONTRIBUTORS COPYRIGHT ChangeLog README README.ASUN TODO VERSION services.atalk

diff --git a/bin/adv1tov2/Makefile.am b/bin/adv1tov2/Makefile.am
index b800c1d575cb3322d8d80a46ebc70d1dac47f2f8..c319b4339c66d3137006a51e3d17e1d104ea925b 100644 (file)
--- a/bin/adv1tov2/Makefile.am
+++ b/bin/adv1tov2/Makefile.am
@@ -3,4 +3,4 @@
 bin_PROGRAMS = adv1tov2
 
 adv1tov2_SOURCES = adv1tov2.c
-adv1tov2_LDADD = $(top_srcdir)/libatalk/libatalk.a
+adv1tov2_LDADD = $(top_builddir)/libatalk/libatalk.la

diff --git a/bin/aecho/Makefile.am b/bin/aecho/Makefile.am
index 8c6063b679d84251a8bb35b25e6ef78b660adf5d..1ae6025a233293432539e8c69c3a354c5daa3a43 100644 (file)
--- a/bin/aecho/Makefile.am
+++ b/bin/aecho/Makefile.am
@@ -3,4 +3,4 @@
 bin_PROGRAMS = aecho
 
 aecho_SOURCES = aecho.c
-aecho_LDADD = $(top_srcdir)/libatalk/libatalk.a
+aecho_LDADD = $(top_builddir)/libatalk/libatalk.la

diff --git a/bin/afile/Makefile.am b/bin/afile/Makefile.am
index 7f18a5a62f8fe9345dc175bdc87b2b71e688bf76..a86cc29be85b68437ad507f41f999dea39eadd8b 100644 (file)
--- a/bin/afile/Makefile.am
+++ b/bin/afile/Makefile.am
@@ -3,11 +3,11 @@
 bin_PROGRAMS = achfile afile
 
 achfile_SOURCES = achfile.c
-achfile_LDADD = $(top_srcdir)/libatalk/libatalk.a
+achfile_LDADD = $(top_builddir)/libatalk/libatalk.la
 
 afile_SOURCES  = afile.c
-afile_LDADD = $(top_srcdir)/libatalk/libatalk.a
+afile_LDADD = $(top_builddir)/libatalk/libatalk.la
 
-LIBS = @LIBS@ -L$(top_srcdir)/libatalk/ -latalk
+LIBS = @LIBS@ -L$(top_builddir)/libatalk/ -latalk
 
 EXTRA_DIST = README acleandir.rc

diff --git a/bin/afppasswd/Makefile.am b/bin/afppasswd/Makefile.am
index eeb648439a7e503f6cfcdd138ac3c1805295625d..142a5189437205956572f4aecc0d49ce8206ec5a 100644 (file)
--- a/bin/afppasswd/Makefile.am
+++ b/bin/afppasswd/Makefile.am
@@ -3,7 +3,7 @@
 bin_PROGRAMS = afppasswd
 
 afppasswd_SOURCES = afppasswd.c
-afppasswd_LDADD = $(top_srcdir)/libatalk/libatalk.a
+afppasswd_LDADD = $(top_builddir)/libatalk/libatalk.la
 
 CFLAGS = @CFLAGS@ \
        -D_PATH_AFPDPWFILE=\"$(CONFIG_DIR)/afppasswd\"

diff --git a/bin/getzones/Makefile.am b/bin/getzones/Makefile.am
index 29fa0ea02973ffaca137ded6f7d4be44453795ab..df25b70a767b20bbd1a9f92e6ec01591e93d7bc1 100644 (file)
--- a/bin/getzones/Makefile.am
+++ b/bin/getzones/Makefile.am
@@ -3,6 +3,6 @@
 bin_PROGRAMS = getzones
 
 getzones_SOURCES = getzones.c
-getzones_LDADD = $(top_srcdir)/libatalk/libatalk.a
+getzones_LDADD = $(top_builddir)/libatalk/libatalk.la
 
 CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys

diff --git a/bin/megatron/Makefile.am b/bin/megatron/Makefile.am
index 77c328a91e7ca077f8722231ce4d068ea9c4d833..01d912863f4e0539a74389984c19ee41fce1583a 100644 (file)
--- a/bin/megatron/Makefile.am
+++ b/bin/megatron/Makefile.am
@@ -3,7 +3,7 @@
 bin_PROGRAMS = megatron
 
 megatron_SOURCES = asingle.c hqx.c macbin.c megatron.c nad.c updcrc.c
-megatron_LDADD = $(top_srcdir)/libatalk/libatalk.a
+megatron_LDADD = $(top_builddir)/libatalk/libatalk.la
 
 noinst_HEADERS = megatron.h
 

diff --git a/bin/nbp/Makefile.am b/bin/nbp/Makefile.am
index 7b4f7d287b2a10ab38386b182a5da4e59399816e..1f82c33087e1c42fe0bf242670ddf2a710cec8f8 100644 (file)
--- a/bin/nbp/Makefile.am
+++ b/bin/nbp/Makefile.am
@@ -3,10 +3,10 @@
 bin_PROGRAMS = nbplkup nbprgstr nbpunrgstr
 
 nbplkup_SOURCES = nbplkup.c
-nbplkup_LDADD = $(top_srcdir)/libatalk/libatalk.a
+nbplkup_LDADD = $(top_builddir)/libatalk/libatalk.la
 
 nbprgstr_SOURCES = nbprgstr.c
-nbprgstr_LDADD = $(top_srcdir)/libatalk/libatalk.a
+nbprgstr_LDADD = $(top_builddir)/libatalk/libatalk.la
 
 nbpunrgstr_SOURCES = nbpunrgstr.c
-nbpunrgstr_LDADD = $(top_srcdir)/libatalk/libatalk.a
+nbpunrgstr_LDADD = $(top_builddir)/libatalk/libatalk.la

diff --git a/bin/pap/Makefile.am b/bin/pap/Makefile.am
index a2af213128946f5b11ae836ef0e11833c1439a09..671461430eee14877ac8d8ec64d94b1d013fbb3f 100644 (file)
--- a/bin/pap/Makefile.am
+++ b/bin/pap/Makefile.am
@@ -3,7 +3,7 @@
 bin_PROGRAMS = pap papstatus
 
 pap_SOURCES = pap.c
-pap_LDADD = $(top_srcdir)/libatalk/libatalk.a
+pap_LDADD = $(top_builddir)/libatalk/libatalk.la
 
 papstatus_SOURCES = papstatus.c
-papstatus_LDADD = $(top_srcdir)/libatalk/libatalk.a
+papstatus_LDADD = $(top_builddir)/libatalk/libatalk.la

diff --git a/bin/psorder/Makefile.am b/bin/psorder/Makefile.am
index a16128af19a8354877890ee6edb8b16ee2022e75..84b8fb42ee9b59589598c57dcef06ef9b1102948 100644 (file)
--- a/bin/psorder/Makefile.am
+++ b/bin/psorder/Makefile.am
@@ -3,6 +3,6 @@
 bin_PROGRAMS = psorder
 
 psorder_SOURCES = psorder.c pa.c
-psorder_LDADD = $(top_srcdir)/libatalk/libatalk.a
+psorder_LDADD = $(top_builddir)/libatalk/libatalk.la
 
 noinst_HEADERS = psorder.h pa.h

diff --git a/config/Makefile.am b/config/Makefile.am
index 42cb3ef5e8763b9ea84af2fca61653a60b7cdd97..b2268ed97613018e444472c0e68f0dc46351efab 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -8,7 +8,7 @@ SUFFIXES = .tmpl .
            -e s@:ETCDIR:@${CONFIG_DIR}@ \
            <$^ >$@
 
-CLEANFILES = afpd.conf
+CLEANFILES = afpd.conf netatalk
 
 configdir = $(CONFIG_DIR)
 

diff --git a/contrib/printing/Makefile.am b/contrib/printing/Makefile.am
index f2173fac6acac47e78109088e392f3c5a476c059..38efcb04a2f61cb4f02fb9e8d30f07341426fb74 100644 (file)
--- a/contrib/printing/Makefile.am
+++ b/contrib/printing/Makefile.am
@@ -4,6 +4,6 @@ bin_SCRIPTS = add_netatalk_printer
 bin_PROGRAMS = timeout
 
 timeout_SOURCES = timeout.c
-timeout_LDADD = $(top_srcdir)/libatalk/libatalk.a
+timeout_LDADD = $(top_builddir)/libatalk/libatalk.la
 
 EXTRA_DIST = netatalk.template

diff --git a/contrib/timelord/Makefile.am b/contrib/timelord/Makefile.am
index f444926d3063edef60e409ad0761f19151acd972..757c6bfbce2725a1327fbd0580f7c9aff69e11ca 100644 (file)
--- a/contrib/timelord/Makefile.am
+++ b/contrib/timelord/Makefile.am
@@ -3,7 +3,7 @@
 sbin_PROGRAMS = timelord
 
 timelord_SOURCES = timelord.c
-timelord_LDADD = ../../libatalk/libatalk.a
+timelord_LDADD = $(top_builddir)/libatalk/libatalk.la
 
 LIBS = @LIBS@ -latalk
 

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 23badcf34872b5f84f4fa3f42a06d257e9c260e4..2ab57509078a85edb4b43419a86508cab60717e9 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -9,7 +9,7 @@ afpd_SOURCES = unix.c ofork.c main.c switch.c auth.c volume.c directory.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_srcdir)/libatalk/libatalk.a -latalk
+afpd_LDADD = $(top_builddir)/libatalk/libatalk.a -latalk
 afpd_LDFLAGS = -rdynamic
 
 noinst_HEADERS = auth.h codepage.h afp_config.h desktop.h directory.h file.h \

diff --git a/etc/atalkd/Makefile.am b/etc/atalkd/Makefile.am
index 4d2a6ad670ca94aac38b62b8767de418ab7a03b1..4f9747206c6834a06d06b078f63e9626fd74e64f 100644 (file)
--- a/etc/atalkd/Makefile.am
+++ b/etc/atalkd/Makefile.am
@@ -3,7 +3,7 @@
 sbin_PROGRAMS = atalkd
 
 atalkd_SOURCES = aep.c config.c main.c multicast.c nbp.c route.c rtmp.c zip.c 
-atalkd_LDADD = -L$(top_srcdir)/libatalk -latalk
+atalkd_LDADD = $(top_builddir)/libatalk/libatalk.la
 
 noinst_HEADERS = atserv.h gate.h interface.h list.h multicast.h nbp.h rtmp.h zip.h
 

diff --git a/etc/papd/Makefile.am b/etc/papd/Makefile.am
index a91a7f54aa799ec5873c93c0fd1197ba14744b62..bdd76f2513c54d8b05bc633a8f3ebd7ce80b9e18 100644 (file)
--- a/etc/papd/Makefile.am
+++ b/etc/papd/Makefile.am
@@ -4,11 +4,11 @@ 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_srcdir)/libatalk/libatalk.a -latalk
+papd_LDADD = $(top_builddir)/libatalk/libatalk.la -latalk
 papd_LDFLAGS = -rdynamic
 
 #showppd_SOURCES = showppd.c ppd.c
-#showppd_LDADD = $(top_srcdir)/libatalk/libatalk.a -latalk
+#showppd_LDADD = $(top_builddir)/libatalk/libatalk.la -latalk
 
 noinst_HEADERS = comment.h file.h ppd.h printer.h uam_auth.h
 

diff --git a/libatalk/Makefile.am b/libatalk/Makefile.am
index a0d1c78ea61549d97f72826235d11218a17b8ee8..5111e043407d66364a54672048c53a1c6dc6c0d5 100644 (file)
--- a/libatalk/Makefile.am
+++ b/libatalk/Makefile.am
@@ -1,13 +1,19 @@
 # Makefile.am for libatalk/
 
+# FIXME: Included manually, because for some strange reason automake doesn't.
+# (srittau)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+
 SUBDIRS = adouble asp atp compat dsi nbp netddp util
 
-lib_LIBRARIES = libatalk.a
+lib_LTLIBRARIES = libatalk.la
 
 LIBATALK_DEPS = asp/libasp.la atp/libatp.la nbp/libnbp.la adouble/libadouble.la dsi/libdsi.la util/libutil.la compat/libcompat.la netddp/libnetddp.la asp/libasp.la
 
-libatalk_a_SOURCES =
-libatalk_a_LIBADD = ${LIBATALK_DEPS}
+libatalk_la_SOURCES =
+libatalk_la_LIBADD  = ${LIBATALK_DEPS}
+libatalk_la_LDFLAGS = -static
 
-libatalk.a: ${LIBATALK_DEPS}
-       ${LIBTOOL} --mode=link ${LIBATALK_DEPS} -o libatalk.a
+#libatalk.a: ${LIBATALK_DEPS}
+#      ${LIBTOOL} --mode=link ${LIBATALK_DEPS} -o libatalk.a