Some more large autoconf/automake fixes. include/ and sys/ should install

diff --git a/Makefile.am b/Makefile.am
index ba63ddd66ed24b14e896910afc132ee6489010c1..0c8fa1e11c9cd051316359e40c5f3e5d6c26a7c7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am for top level of netatalk package
 
-SUBDIRS = libatalk bin etc man
-# these later : config contrib distrib include
+SUBDIRS = libatalk bin config etc man
+# these later : contrib distrib 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 929bf07fd7065304f1ad679fb9009f575d59fd09..9a269e7e8e8b6aa6bd5d0cdabaa49aae839a0208 100644 (file)
--- a/bin/adv1tov2/Makefile.am
+++ b/bin/adv1tov2/Makefile.am
@@ -3,6 +3,6 @@
 bin_PROGRAMS = adv1tov2
 
 adv1tov2_SOURCES = adv1tov2.c
-adv1tov2_LDADD = ../../libatalk/libatalk.a
+adv1tov2_LDADD = $(top_srcdir)/libatalk/libatalk.a
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys

diff --git a/bin/aecho/Makefile.am b/bin/aecho/Makefile.am
index aac565d2b4707185e481d0c914d0c41e14b258f2..30a122625fb41dd93faa99ce6516c3db9396fb74 100644 (file)
--- a/bin/aecho/Makefile.am
+++ b/bin/aecho/Makefile.am
@@ -3,6 +3,6 @@
 bin_PROGRAMS = aecho
 
 aecho_SOURCES = aecho.c
-aecho_LDADD = ../../libatalk/libatalk.a
+aecho_LDADD = $(top_srcdir)/libatalk/libatalk.a
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys

diff --git a/bin/afppasswd/Makefile.am b/bin/afppasswd/Makefile.am
index 1d42f5d030ef242de2a0ab7dc7e6b17ed26c0aef..d83674fc0226c062d328590f2b27e01a79a2cb09 100644 (file)
--- a/bin/afppasswd/Makefile.am
+++ b/bin/afppasswd/Makefile.am
@@ -3,6 +3,6 @@
 bin_PROGRAMS = afppasswd
 
 afppasswd_SOURCES = afppasswd.c
-afppasswd_LDADD = ../../libatalk/libatalk.a
+afppasswd_LDADD = $(top_srcdir)/libatalk/libatalk.a
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys

diff --git a/bin/getzones/Makefile.am b/bin/getzones/Makefile.am
index 0a2845901a1ca0bc67b3ddb093de9e1999f155a8..29fa0ea02973ffaca137ded6f7d4be44453795ab 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 = ../../libatalk/libatalk.a
+getzones_LDADD = $(top_srcdir)/libatalk/libatalk.a
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys

diff --git a/bin/megatron/Makefile.am b/bin/megatron/Makefile.am
index a2ae0b02ac824efd0b839409bfbbb6b502b791a9..cbc5e62dc2d9bae405bb1495f7e878a9e761bce7 100644 (file)
--- a/bin/megatron/Makefile.am
+++ b/bin/megatron/Makefile.am
@@ -3,11 +3,11 @@
 bin_PROGRAMS = megatron
 
 megatron_SOURCES = asingle.c hqx.c macbin.c megatron.c nad.c updcrc.c
-megatron_LDADD = ../../libatalk/libatalk.a
+megatron_LDADD = $(top_srcdir)/libatalk/libatalk.a
 
 noinst_HEADERS = megatron.h
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys
 
 # ************************************************
 # FIXME! FIXME! Links need to work for:

diff --git a/bin/nbp/Makefile.am b/bin/nbp/Makefile.am
index bc54d76e4fe5fb280b67eb6bf3febca4fad3558e..92de87537fef01f7ffb29bea28063151338b65fb 100644 (file)
--- a/bin/nbp/Makefile.am
+++ b/bin/nbp/Makefile.am
@@ -3,12 +3,12 @@
 bin_PROGRAMS = nbplkup nbprgstr nbpunrgstr
 
 nbplkup_SOURCES = nbplkup.c
-nbplkup_LDADD = ../../libatalk/libatalk.a
+nbplkup_LDADD = $(top_srcdir)/libatalk/libatalk.a
 
 nbprgstr_SOURCES = nbprgstr.c
-nbprgstr_LDADD = ../../libatalk/libatalk.a
+nbprgstr_LDADD = $(top_srcdir)/libatalk/libatalk.a
 
 nbpunrgstr_SOURCES = nbpunrgstr.c
-nbpunrgstr_LDADD = ../../libatalk/libatalk.a
+nbpunrgstr_LDADD = $(top_srcdir)/libatalk/libatalk.a
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys

diff --git a/bin/pap/Makefile.am b/bin/pap/Makefile.am
index f426bdc8c6687e15110f3891cfc3067e954ada9c..32a07c173e00a93fa8578161cbbf9e9ee2c81e26 100644 (file)
--- a/bin/pap/Makefile.am
+++ b/bin/pap/Makefile.am
@@ -3,9 +3,9 @@
 bin_PROGRAMS = pap papstatus
 
 pap_SOURCES = pap.c
-pap_LDADD = ../../libatalk/libatalk.a
+pap_LDADD = $(top_srcdir)/libatalk/libatalk.a
 
 papstatus_SOURCES = papstatus.c
-papstatus_LDADD = ../../libatalk/libatalk.a
+papstatus_LDADD = $(top_srcdir)/libatalk/libatalk.a
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys

diff --git a/bin/psorder/Makefile.am b/bin/psorder/Makefile.am
index 82adc89088520e335cba1afec54abec0ccc9ca1c..1201a388fbda91088e84d3bdbe1009f42cea6be1 100644 (file)
--- a/bin/psorder/Makefile.am
+++ b/bin/psorder/Makefile.am
@@ -3,8 +3,8 @@
 bin_PROGRAMS = psorder
 
 psorder_SOURCES = psorder.c pa.c
-psorder_LDADD = ../../libatalk/libatalk.a
+psorder_LDADD = $(top_srcdir)/libatalk/libatalk.a
 
 noinst_HEADERS = psorder.h pa.h
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys

diff --git a/config/Makefile.am b/config/Makefile.am
new file mode 100644 (file)
index 0000000..19cc880
--- /dev/null
+++ b/config/Makefile.am
@@ -0,0 +1,5 @@
+# Makefile.am for config/
+
+configdir = $(CONFIG_DIR)
+
+config_DATA = AppleVolumes.default AppleVolumes.system afpd.conf atalkd.conf netatalk.conf netatalk.pamd papd.conf

diff --git a/configure.in b/configure.in
index d6b2b37169e49e96fb7cd29b860530aa3281c9e1..b01ec2a08c91c682fb8c4a526cf48e834edf8fd0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -158,6 +158,7 @@ AC_OUTPUT([Makefile
        bin/nbp/Makefile
        bin/pap/Makefile
        bin/psorder/Makefile
+       config/Makefile
        etc/Makefile
        etc/afpd/Makefile
        etc/afpd/nls/Makefile
@@ -165,6 +166,8 @@ AC_OUTPUT([Makefile
        etc/uams/Makefile
        etc/papd/Makefile
        etc/psf/Makefile
+       include/Makefile
+       include/atalk/Makefile
        libatalk/Makefile
        libatalk/adouble/Makefile
        libatalk/asp/Makefile
@@ -179,5 +182,7 @@ AC_OUTPUT([Makefile
        man/man3/Makefile
        man/man4/Makefile
        man/man8/Makefile
+       sys/Makefile
+       sys/netatalk/Makefile
 ])
 

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index dc8f9d69a9346dcae49d7dba10061ea0ca81bc95..5b644062e7ba326dddb0787702d4c67562c4f2df 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 config.c nfsquota.c codepage.c quota.c uam.c afs.c
-afpd_LDADD = ../../libatalk/libatalk.a -latalk
+afpd_LDADD = $(top_srcdir)/libatalk/libatalk.a -latalk
 
 noinst_HEADERS = auth.h codepage.h 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 unix.h volume.h
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys \
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys \
         -D_PATH_AFPDDEFVOL=\"$(CONFIG_DIR)/AppleVolumes.default\" \
         -D_PATH_AFPDSYSVOL=\"$(CONFIG_DIR)/AppleVolumes.system\" \
         -D_PATH_AFPDPWFILE=\"$(CONFIG_DIR)/afpd.passwd\" \

diff --git a/etc/atalkd/Makefile.am b/etc/atalkd/Makefile.am
index 76849cb818a1b45789238ae5eeb76263cd6b2680..e718f29536575906e1a552633f0ec3e7298e8908 100644 (file)
--- a/etc/atalkd/Makefile.am
+++ b/etc/atalkd/Makefile.am
@@ -3,10 +3,10 @@
 sbin_PROGRAMS = atalkd
 
 atalkd_SOURCES = aep.c config.c main.c multicast.c nbp.c route.c rtmp.c zip.c 
-atalkd_LDADD = -L../../libatalk -latalk
+atalkd_LDADD = -L$(top_srcdir)/libatalk -latalk
 
 noinst_HEADERS = atserv.h gate.h interface.h list.h multicast.h nbp.h rtmp.h zip.h
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys \
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys \
        -D_PATH_ATALKDCONF=\"$(CONFIG_DIR)/atalkd.conf\" \
        -DVERSION=\"$(NETATALK_VERSION)\"

diff --git a/etc/papd/Makefile.am b/etc/papd/Makefile.am
index 4a71ab8db2f58dc70665c1ec6e175b973d2ae545..81a6ccf3e0fb60a6a1c0e9418a445533575e4712 100644 (file)
--- a/etc/papd/Makefile.am
+++ b/etc/papd/Makefile.am
@@ -3,11 +3,11 @@
 sbin_PROGRAMS = papd
 
 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 = ../../libatalk/libatalk.a -latalk
+papd_LDADD = $(top_srcdir)/libatalk/libatalk.a -latalk
 
 noinst_HEADERS = comment.h file.h ppd.h printer.h uam_auth.h
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys \
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys \
        -D_PATH_PAPDCONF=\"$(CONFIG_DIR)/papd.conf\" \
        -D_PATH_PAPDUAMPATH=\"$(UAMS_PATH)/\" \
        -DVERSION=\"$(NETATALK_VERSION)\"

diff --git a/etc/psf/Makefile.am b/etc/psf/Makefile.am
index 99c0b0221e1afdd70856071b78eaac43b822370a..b04454a6b0dda8e5232cca2853ddc4e4fa9d9ebe 100644 (file)
--- a/etc/psf/Makefile.am
+++ b/etc/psf/Makefile.am
@@ -5,7 +5,7 @@ sbin_PROGRAMS = psf psa
 psf_SOURCES = psf.c
 psa_SOURCES = psa.c
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys \
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys \
        -DZEROWIDTH \
        -D_PATH_PAP=\"$(bindir)/pap\" \
        -D_PATH_PSORDER=\"$(bindir)/psorder\" \

diff --git a/etc/uams/Makefile.am b/etc/uams/Makefile.am
index 7fbdc2dbba82b9d97bd4bd154855998326b3de3d..72a67a2dba82949bc76e035182ab17f75082595b 100644 (file)
--- a/etc/uams/Makefile.am
+++ b/etc/uams/Makefile.am
@@ -12,4 +12,4 @@ lib_uams_pam_la_SOURCES = uams_pam.c
 lib_uams_pgp_la_SOURCES = uams_pgp.c
 lib_uams_randnum_la_SOURCES = uams_randnum.c
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys

diff --git a/include/atalk/Makefile.am b/include/atalk/Makefile.am
index f6ef5405e36ab154edca682c0a0dd6efe3f9dd96..d904ff46822059c9d641679741dc83331bb48d4a 100644 (file)
--- a/include/atalk/Makefile.am
+++ b/include/atalk/Makefile.am
@@ -1,5 +1,4 @@
 # Makefile.am for include/atalk/
 
-bin_PROGRAMS = 
-
-include_HEADERS = adouble.h aep.h afp.h asp.h atp.h cnid.h compat.h ddp.h dsi.h nbp.h netddp.h pap.h paths.h rtmp.h server_child.h uam.h util.h zip.h
+atalkincludedir = $(includedir)/atalk
+atalkinclude_DATA = adouble.h aep.h afp.h asp.h atp.h cnid.h compat.h ddp.h dsi.h nbp.h netddp.h pap.h paths.h rtmp.h server_child.h uam.h util.h zip.h

diff --git a/libatalk/adouble/Makefile.am b/libatalk/adouble/Makefile.am
index d92ae7c074b7bf2b945fcced0fe0362ac02c0ae9..1cf1d10f4e57462135c4af3ac72daa7652d8c7a8 100644 (file)
--- a/libatalk/adouble/Makefile.am
+++ b/libatalk/adouble/Makefile.am
@@ -6,4 +6,4 @@ libadouble_la_SOURCES = ad_open.c ad_flush.c ad_read.c ad_write.c ad_size.c ad_m
 
 noinst_HEADERS = ad_private.h
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys

diff --git a/libatalk/asp/Makefile.am b/libatalk/asp/Makefile.am
index d5840fe7be14a139616a522e9b2d8086f1915fec..a88ee652b53487914e1c73121cbdbe684be325fb 100644 (file)
--- a/libatalk/asp/Makefile.am
+++ b/libatalk/asp/Makefile.am
@@ -6,4 +6,4 @@ libasp_la_SOURCES = asp_attn.c asp_close.c asp_cmdreply.c asp_getreq.c asp_getse
 
 noinst_HEADERS = asp_child.h
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys

diff --git a/libatalk/atp/Makefile.am b/libatalk/atp/Makefile.am
index 5766e254ee05091ea3812a36184271679553d6ab..5ede3c90c79d6f1539a241f7a94fed96b0720d72 100644 (file)
--- a/libatalk/atp/Makefile.am
+++ b/libatalk/atp/Makefile.am
@@ -6,4 +6,4 @@ libatp_la_SOURCES = atp_bprint.c atp_bufs.c atp_close.c atp_open.c atp_packet.c
 
 noinst_HEADERS = atp_internals.h
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys

diff --git a/libatalk/cnid/Makefile.am b/libatalk/cnid/Makefile.am
index 92d6979d3d0d94739dfc50843fb9776d5f8f0ef7..1b18fbb4b23c777a92813109019ca1eae30a2922 100644 (file)
--- a/libatalk/cnid/Makefile.am
+++ b/libatalk/cnid/Makefile.am
@@ -8,4 +8,4 @@ noinst_HEADERS = cnid_meta.h cnid_private.h
 
 EXTRA_DIST = README
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys

diff --git a/libatalk/compat/Makefile.am b/libatalk/compat/Makefile.am
index 64473a9f405cad298916370e564e6f4b186e0fec..055d65174c0a9defb8d256ae9fe9d719c36238eb 100644 (file)
--- a/libatalk/compat/Makefile.am
+++ b/libatalk/compat/Makefile.am
@@ -4,4 +4,4 @@ noinst_LTLIBRARIES = libcompat.la
 
 libcompat_la_SOURCES = mktemp.c getusershell.c strcasecmp.c strstr.c flock.c strdup.c inet_aton.c rquota_xdr.c 
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys

diff --git a/libatalk/dsi/Makefile.am b/libatalk/dsi/Makefile.am
index c00cbfbba7f6164be5da8d93bad12eb01d02536e..8b50c4595fbb3e42762cb0bec88cc7347febd6ca 100644 (file)
--- a/libatalk/dsi/Makefile.am
+++ b/libatalk/dsi/Makefile.am
@@ -6,4 +6,4 @@ libdsi_la_SOURCES = dsi_attn.c dsi_close.c dsi_cmdreply.c dsi_getsess.c dsi_gets
 
 noinst_HEADERS = dsi_private.h
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys

diff --git a/libatalk/nbp/Makefile.am b/libatalk/nbp/Makefile.am
index 73257f5b8702e4a582930fd4c67a9ef1f4a49b85..14c17592cbd4d3c0e30eeb94ea054c23c41cdfee 100644 (file)
--- a/libatalk/nbp/Makefile.am
+++ b/libatalk/nbp/Makefile.am
@@ -6,4 +6,4 @@ libnbp_la_SOURCES = nbp_util.c nbp_lkup.c nbp_rgstr.c nbp_unrgstr.c
 
 noinst_HEADERS = nbp_conf.h
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys

diff --git a/libatalk/netddp/Makefile.am b/libatalk/netddp/Makefile.am
index a2bbe472ddf18ded521106a84563239304d7482c..bcc54f673c3e7c8f47175e4ae3dd093fc8723f88 100644 (file)
--- a/libatalk/netddp/Makefile.am
+++ b/libatalk/netddp/Makefile.am
@@ -4,4 +4,4 @@ noinst_LTLIBRARIES = libnetddp.la
 
 libnetddp_la_SOURCES = netddp_open.c netddp_sendto.c netddp_recvfrom.c
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys

diff --git a/libatalk/pap/Makefile.am b/libatalk/pap/Makefile.am
index e2ad95785bfa48060d765324486b206522b6eb71..24b257ff8ca6e7a5018c68b7e125366e7ee65517 100644 (file)
--- a/libatalk/pap/Makefile.am
+++ b/libatalk/pap/Makefile.am
@@ -6,4 +6,4 @@ libpap_la_SOURCES = pap_close.c pap_init.c pap_open.c pap_read.c pap_sendstatus.
 
 noinst_HEADERS = pap_child.h
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys

diff --git a/libatalk/util/Makefile.am b/libatalk/util/Makefile.am
index c9e01e73804150837fe62700adf6d02f4cfdbbc9..d9cdcdc2d288883ab8f4b2ad39b6f8fb679722a7 100644 (file)
--- a/libatalk/util/Makefile.am
+++ b/libatalk/util/Makefile.am
@@ -4,4 +4,4 @@ noinst_LTLIBRARIES = libutil.la
 
 libutil_la_SOURCES = atalk_addr.c strdicasecmp.c server_child.c server_lock.c module.c bprint.c getiface.c
 
-CFLAGS = @CFLAGS@ -I../../include -I../../sys
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys

diff --git a/sys/Makefile.am b/sys/Makefile.am
new file mode 100644 (file)
index 0000000..2ab0355
--- /dev/null
+++ b/sys/Makefile.am
@@ -0,0 +1,3 @@
+# Makefile.am for sys/
+
+SUBDIRS = netatalk

diff --git a/sys/netatalk/Makefile.am b/sys/netatalk/Makefile.am
new file mode 100644 (file)
index 0000000..1caa7ad
--- /dev/null
+++ b/sys/netatalk/Makefile.am
@@ -0,0 +1,5 @@
+# Makefile.am for sys/netatalk/
+
+netatalkincludedir = $(includedir)/netatalk
+
+netatalkinclude_DATA = aarp.c aarp.h at.h at_control.c at_proto.c at_var.h ddp.h ddp_input.c ddp_output.c ddp_usrreq.c ddp_var.h endian.h phase2.h