CFLAGS -> INCLUDES and other build fixes.

diff --git a/bin/afppasswd/Makefile.am b/bin/afppasswd/Makefile.am
index b9fad222a1e4d4f76243de6e9203b4d8df8c12f3..34cd13b4e32f78d7e3f126e4d50d0b1da542d8d3 100644 (file)
--- a/bin/afppasswd/Makefile.am
+++ b/bin/afppasswd/Makefile.am
@@ -11,10 +11,10 @@ endif
 afppasswd_SOURCES = afppasswd.c
 afppasswd_LDADD = $(top_builddir)/libatalk/libatalk.la @SSL_LIBS@
 
-CFLAGS = @CFLAGS@ @SSL_CFLAGS@ -I$(top_srcdir)/sys \
+INCLUDES = @SSL_CFLAGS@ -I$(top_srcdir)/sys \
     -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\"
 
 install-exec-hook:
 if USE_DHX
        chmod u+s $(DESTDIR)$(bindir)/afppasswd
-endif
\ No newline at end of file
+endif

diff --git a/bin/getzones/Makefile.am b/bin/getzones/Makefile.am
index df25b70a767b20bbd1a9f92e6ec01591e93d7bc1..1741bafca088737b799bbc5de64d6be975b5bae8 100644 (file)
--- a/bin/getzones/Makefile.am
+++ b/bin/getzones/Makefile.am
@@ -5,4 +5,4 @@ bin_PROGRAMS = getzones
 getzones_SOURCES = getzones.c
 getzones_LDADD = $(top_builddir)/libatalk/libatalk.la
 
-CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys

diff --git a/contrib/a2boot/Makefile.am b/contrib/a2boot/Makefile.am
index 02d583cad26de3182267fb9bc6819d4389d0fe50..fc82a9ac71f6cc0e6ed2a9f7b56092b74d59c199 100644 (file)
--- a/contrib/a2boot/Makefile.am
+++ b/contrib/a2boot/Makefile.am
@@ -5,12 +5,10 @@ sbin_PROGRAMS = a2boot
 a2boot_SOURCES = a2boot.c
 a2boot_LDADD = $(top_builddir)/libatalk/libatalk.la
 
-LIBS = @LIBS@
-
 EXTRA_DIST = COPYRIGHT VERSION
 
-CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys \
-        @CFLAGS@ @SLP_CFLAGS@ \
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys \
+        @SLP_CFLAGS@ \
         -D_PATH_A_GS_BLOCKS=\"$(PKGCONFDIR)/a2boot/ProDOS16\ Boot\ Blocks\" \
         -D_PATH_A_2E_BLOCKS=\"$(PKGCONFDIR)/a2boot/Apple\ :2f:2fe\ Boot\ Blocks\" \
         -D_PATH_P16_IMAGE=\"$(PKGCONFDIR)/a2boot/ProDOS16\ Image\"

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 3359ea38406968f3a60886245b7e0cfb7b8b4ec9..56308fef88fee0e65c7c275fd6e763990e87c1b5 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -13,17 +13,16 @@ afpd_SOURCES = unix.c ofork.c main.c switch.c auth.c volume.c directory.c \
         afp_config.c nfsquota.c codepage.c quota.c uam.c afs.c uid.c  \
         afp_util.c catsearch.c precompose.c
 
-afpd_LDADD = $(top_builddir)/libatalk/libatalk.la
+afpd_LDADD = @AFPD_LIBS@ @PAM_LIBS@ @QUOTA_LIBS@ @SLP_LIBS@ \
+       $(top_builddir)/libatalk/libatalk.la
 afpd_LDFLAGS = -export-dynamic
 
 noinst_HEADERS = auth.h codepage.h afp_config.h desktop.h directory.h file.h \
         filedir.h fork.h globals.h icon.h mangle.h misc.h status.h switch.h \
         uam_auth.h uid.h unix.h volume.h
 
-LIBS = @LIBS@ @AFPD_LIBS@ @QUOTA_LIBS@ @SLP_LIBS@
-
-CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys \
-        @CFLAGS@ @SLP_CFLAGS@ \
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys \
+        @SLP_CFLAGS@ \
         -D_PATH_AFPDDEFVOL=\"$(pkgconfdir)/AppleVolumes.default\" \
         -D_PATH_AFPDSYSVOL=\"$(pkgconfdir)/AppleVolumes.system\" \
         -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\" \

diff --git a/etc/afpd/nls/Makefile.am b/etc/afpd/nls/Makefile.am
index 752701abd84d5a1db6910516a8d0365c8e7593dd..99aa4fcbf6ddda3ebd11587277e3bd38b8a165ef 100644 (file)
--- a/etc/afpd/nls/Makefile.am
+++ b/etc/afpd/nls/Makefile.am
@@ -15,7 +15,7 @@ MACCODES =                            \
        maccode.iso8859-1.adapted       \
        maccode.koi8-r
 
-CFLAGS = -I$(top_srcdir)/sys -I$(top_srcdir)/etc/afpd @CFLAGS@
+INCLUDES = -I$(top_srcdir)/sys -I$(top_srcdir)/etc/afpd
 
 $(MACCODES): makecode
        ./makecode $@

diff --git a/etc/atalkd/Makefile.am b/etc/atalkd/Makefile.am
index 2e0a18d3f447906c83a50acecae72821cf74c365..c250ed4ab4e404890fe3a2acb13add4956b53e13 100644 (file)
--- a/etc/atalkd/Makefile.am
+++ b/etc/atalkd/Makefile.am
@@ -19,4 +19,4 @@ noinst_HEADERS =      \
        rtmp.h          \
        zip.h
 
-CFLAGS = @CFLAGS@ -D_PATH_ATALKDCONF=\"$(pkgconfdir)/atalkd.conf\"
+INCLUDES = -D_PATH_ATALKDCONF=\"$(pkgconfdir)/atalkd.conf\"

diff --git a/etc/papd/Makefile.am b/etc/papd/Makefile.am
index 40eeed2a9f03b5209a2b30a89c840917200eb207..c878a6ffd8cb74945db6aa7cb6a5881174a3e68e 100644 (file)
--- a/etc/papd/Makefile.am
+++ b/etc/papd/Makefile.am
@@ -7,7 +7,7 @@ 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 = $(top_builddir)/libatalk/libatalk.la
+papd_LDADD = @PAM_LIBS@ $(top_builddir)/libatalk/libatalk.la
 papd_LDFLAGS = -export-dynamic
 
 #showppd_SOURCES = showppd.c ppd.c
@@ -23,10 +23,7 @@ noinst_HEADERS =     \
        session.h       \
        uam_auth.h
 
-CFLAGS = \
+INCLUDES = \
        -I$(top_srcdir)/include -I$(top_srcdir)/sys \
-       @CFLAGS@ \
        -D_PATH_PAPDCONF=\"$(pkgconfdir)/papd.conf\" \
        -D_PATH_PAPDUAMPATH=\"$(UAMS_PATH)/\"
-
-LIBS = @PAM_LIBS@

diff --git a/etc/psf/Makefile.am b/etc/psf/Makefile.am
index 12ec3656dd33dffbd8688d27181a1e7e5cf66992..c5b0a00b9afbada03b5bf29361c66d402cf50091 100644 (file)
--- a/etc/psf/Makefile.am
+++ b/etc/psf/Makefile.am
@@ -8,7 +8,7 @@ pkgdata_DATA = pagecount.ps
 psf_SOURCES = psf.c
 psa_SOURCES = psa.c
 
-CFLAGS = @CFLAGS@ -DZEROWIDTH \
+INCLUDES = -DZEROWIDTH \
        -D_PATH_PAP=\"$(bindir)/pap\" \
        -D_PATH_PSORDER=\"$(bindir)/psorder\" \
        -D_PATH_PSA=\"$(libexecdir)/psa\" \

diff --git a/etc/uams/Makefile.am b/etc/uams/Makefile.am
index 7b673fa6c16c86dd3a3bbe5fd7c69edd9b29037a..60b2dde6ac02a0383d015b7c5c30c853bb138bfc 100644 (file)
--- a/etc/uams/Makefile.am
+++ b/etc/uams/Makefile.am
@@ -48,8 +48,7 @@ uams_dhx_pam_la_SOURCES    = uams_dhx_pam.c
 # flags
 #
 
-# do that on behalf of the brokeness of automake 1.4
-CFLAGS = @CFLAGS@ @SSL_CFLAGS@
+INCLUDES = @SSL_CFLAGS@
 
 uams_guest_la_CFLAGS      = @CFLAGS@
 uams_randnum_la_CFLAGS    = @CFLAGS@ @SSL_CFLAGS@

diff --git a/libatalk/asp/Makefile.am b/libatalk/asp/Makefile.am
index ffc53876d48f156836b750ff2a1f3c9057bc8ef0..30c02de4a2d5e7e7254fb62aea37311870f86d44 100644 (file)
--- a/libatalk/asp/Makefile.am
+++ b/libatalk/asp/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile.am for libatalk/asp/
 
-CFLAGS = -I$(top_srcdir) @CFLAGS@
+INCLUDES = -I$(top_srcdir)
 
 noinst_LTLIBRARIES = libasp.la
 

diff --git a/libatalk/cnid/Makefile.am b/libatalk/cnid/Makefile.am
index c7fabbf5a9abe9e2f20b9baa2098a24ace971d4d..7518f64f9d9c80b84dbf84fc39aac3d135116250 100644 (file)
--- a/libatalk/cnid/Makefile.am
+++ b/libatalk/cnid/Makefile.am
@@ -1,11 +1,11 @@
 # Makefile.am for libatalk/cnid/
 
-CFLAGS = @CFLAGS@ @BDB_CFLAGS@
-LIBS = @LIBS@ @BDB_LIBS@
+INCLUDES = @BDB_CFLAGS@
 
 noinst_LTLIBRARIES = libcnid.la
 
 libcnid_la_SOURCES = cnid_add.c cnid_close.c cnid_delete.c cnid_get.c cnid_lookup.c cnid_mangle_add.c cnid_mangle_get.c cnid_open.c cnid_resolve.c cnid_update.c
+libcnid_la_LIBADD = @BDB_LIBS@
 
 noinst_HEADERS = cnid_meta.h cnid_private.h 
 

diff --git a/libatalk/util/Makefile.am b/libatalk/util/Makefile.am
index 8c4ffdae7d5ab116721792a56cbfb4a408efeeba..67c16dc8a00cb1732ebed5a71e7b9a2a1d34f715 100644 (file)
--- a/libatalk/util/Makefile.am
+++ b/libatalk/util/Makefile.am
@@ -2,7 +2,7 @@
 
 noinst_LTLIBRARIES = libutil.la
 
-CFLAGS = -I$(top_srcdir)/sys @CFLAGS@
+INCLUDES = -I$(top_srcdir)/sys
 
 libutil_la_SOURCES = \
        atalk_addr.c    \