Dont duplicate CFLAGS in AM_CFLAGS. Inspired by Jonas Smedegaard.

diff --git a/bin/afppasswd/Makefile.am b/bin/afppasswd/Makefile.am
index 9a2959830253ff554275ec44c2c3e9b405585da9..cab2df66125687dc2014435fd59fac1cd28fea43 100644 (file)
--- a/bin/afppasswd/Makefile.am
+++ b/bin/afppasswd/Makefile.am
@@ -11,7 +11,7 @@ endif
 afppasswd_SOURCES = afppasswd.c
 afppasswd_LDADD = $(top_builddir)/libatalk/libatalk.la @SSL_LIBS@
 
 afppasswd_SOURCES = afppasswd.c
 afppasswd_LDADD = $(top_builddir)/libatalk/libatalk.la @SSL_LIBS@
 

-AM_CFLAGS = @CFLAGS@ @SSL_CFLAGS@ -I$(top_srcdir)/sys \
+AM_CFLAGS = @SSL_CFLAGS@ -I$(top_srcdir)/sys \

     -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\"
 
 install-exec-hook:
     -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\"
 
 install-exec-hook:

diff --git a/contrib/a2boot/Makefile.am b/contrib/a2boot/Makefile.am
index c4139bb7c75fe2cc979ae5be32ea9e432f14164f..9ab8cba96e253e06a30fcec66a6fb291df2ffd76 100644 (file)
--- a/contrib/a2boot/Makefile.am
+++ b/contrib/a2boot/Makefile.am
@@ -10,7 +10,7 @@ LIBS = @LIBS@
 EXTRA_DIST = COPYRIGHT VERSION
 
 AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys \
 EXTRA_DIST = COPYRIGHT VERSION
 
 AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys \

-        @CFLAGS@ @SLP_CFLAGS@ \
+        @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\"
         -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/contrib/acltests/Makefile.am b/contrib/acltests/Makefile.am
index 75eba006a7830dc936fd3545e3a2854d65758fe6..a8736f85dc46f5d1cdffc61252582c4773b9781b 100644 (file)
--- a/contrib/acltests/Makefile.am
+++ b/contrib/acltests/Makefile.am
@@ -6,5 +6,5 @@ bin_PROGRAMS = uuidtest
 uuidtest_SOURCES = uuidtest.c
 uuidtest_LDADD =  $(top_builddir)/libatalk/libatalk.la
 
 uuidtest_SOURCES = uuidtest.c
 uuidtest_LDADD =  $(top_builddir)/libatalk/libatalk.la
 

-AM_CFLAGS = @CFLAGS@ -D_PATH_ACL_LDAPCONF=\"$(pkgconfdir)/ldap.conf\"
+AM_CFLAGS = -D_PATH_ACL_LDAPCONF=\"$(pkgconfdir)/ldap.conf\"

 endif
 endif

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 872281098563553617d96089f95a01c7e2a3830b..4221e47e20779b4b5718c5cb4199e27db9333d74 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -25,7 +25,7 @@ noinst_HEADERS = auth.h afp_config.h desktop.h directory.h file.h \
 LIBS = @LIBS@ @QUOTA_LIBS@ @SLP_LIBS@ @WRAP_LIBS@ @LIBADD_DL@
 
 AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys \
 LIBS = @LIBS@ @QUOTA_LIBS@ @SLP_LIBS@ @WRAP_LIBS@ @LIBADD_DL@
 
 AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys \

-        @CFLAGS@ @SLP_CFLAGS@ \
+        @SLP_CFLAGS@ \

         -D_PATH_AFPDDEFVOL=\"$(pkgconfdir)/AppleVolumes.default\" \
         -D_PATH_AFPDSYSVOL=\"$(pkgconfdir)/AppleVolumes.system\" \
         -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\" \
         -D_PATH_AFPDDEFVOL=\"$(pkgconfdir)/AppleVolumes.default\" \
         -D_PATH_AFPDSYSVOL=\"$(pkgconfdir)/AppleVolumes.system\" \
         -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\" \

diff --git a/etc/atalkd/Makefile.am b/etc/atalkd/Makefile.am
index 56eadfb25103e3d09ff03ce4dcbc441e1f65d656..098a5297de9d34c10a4c18dc7ee6f06881c80ec9 100644 (file)
--- a/etc/atalkd/Makefile.am
+++ b/etc/atalkd/Makefile.am
@@ -19,4 +19,4 @@ noinst_HEADERS =      \
        rtmp.h          \
        zip.h
 
        rtmp.h          \
        zip.h
 

-AM_CFLAGS = @CFLAGS@ -D_PATH_ATALKDCONF=\"$(pkgconfdir)/atalkd.conf\"
+AM_CFLAGS = -D_PATH_ATALKDCONF=\"$(pkgconfdir)/atalkd.conf\"

diff --git a/etc/cnid_dbd/Makefile.am b/etc/cnid_dbd/Makefile.am
index eeb8b6f70e904b8078b314788a197e9ab615902e..d3af2bbb87c669bcc6a4aa43ebada00040843950 100644 (file)
--- a/etc/cnid_dbd/Makefile.am
+++ b/etc/cnid_dbd/Makefile.am
@@ -20,7 +20,6 @@ dbd_SOURCES = cmd_dbd.c cmd_dbd_scanvol.c cmd_dbd_lookup.c \
                          dbif.c pack.c \
                          dbd_delete.c dbd_update.c dbd_add.c dbd_lookup.c \
                          dbd_rebuild_add.c dbd_getstamp.c
                          dbif.c pack.c \
                          dbd_delete.c dbd_update.c dbd_add.c dbd_lookup.c \
                          dbd_rebuild_add.c dbd_getstamp.c

-dbd_CFLAGS = $(AM_CFLAGS)

 dbd_LDADD = $(top_builddir)/libatalk/libatalk.la @BDB_LIBS@
 
 noinst_HEADERS = dbif.h pack.h db_param.h dbd.h usockfd.h comm.h cmd_dbd.h
 dbd_LDADD = $(top_builddir)/libatalk/libatalk.la @BDB_LIBS@
 
 noinst_HEADERS = dbif.h pack.h db_param.h dbd.h usockfd.h comm.h cmd_dbd.h

diff --git a/etc/papd/Makefile.am b/etc/papd/Makefile.am
index 34dee05a5d1c9375cd780aa28b482568103f1894..6a09abdb374b0a4196e32565d8f5f2f98eabcb51 100644 (file)
--- a/etc/papd/Makefile.am
+++ b/etc/papd/Makefile.am
@@ -13,7 +13,7 @@ papd_LDADD = $(top_builddir)/libatalk/libatalk.la @CUPS_LIBS@ @LIBADD_DL@
 papd_LDFLAGS = -export-dynamic @CUPS_LDFLAGS@
 
 showppd_SOURCES = showppd.c ppd.c
 papd_LDFLAGS = -export-dynamic @CUPS_LDFLAGS@
 
 showppd_SOURCES = showppd.c ppd.c

-showppd_CFLAGS = @CFLAGS@ -DSHOWPPD
+showppd_CFLAGS = -DSHOWPPD

 showppd_LDADD = $(top_builddir)/libatalk/libatalk.la
 
 noinst_HEADERS =       \
 showppd_LDADD = $(top_builddir)/libatalk/libatalk.la
 
 noinst_HEADERS =       \


@@ -29,7 +29,7 @@ noinst_HEADERS =      \
 
 AM_CFLAGS = \
        -I$(top_srcdir)/include -I$(top_srcdir)/sys \
 
 AM_CFLAGS = \
        -I$(top_srcdir)/include -I$(top_srcdir)/sys \

-       @CFLAGS@ @CUPS_CFLAGS@\
+       @CUPS_CFLAGS@\

        -D_PATH_PAPDCONF=\"$(pkgconfdir)/papd.conf\" \
        -D_PATH_PAPDUAMPATH=\"$(UAMS_PATH)/\" \
        -DSPOOLDIR=\"$(spooldir)/\"
        -D_PATH_PAPDCONF=\"$(pkgconfdir)/papd.conf\" \
        -D_PATH_PAPDUAMPATH=\"$(UAMS_PATH)/\" \
        -DSPOOLDIR=\"$(spooldir)/\"

diff --git a/etc/psf/Makefile.am b/etc/psf/Makefile.am
index 46ed3c39d213c3759d9ccc0be56f33181bed0e2d..8cb795a99921718aaff7d6ef04ed383c52f58e88 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
 
 psf_SOURCES = psf.c
 psa_SOURCES = psa.c
 

-AM_CFLAGS = @CFLAGS@ -DZEROWIDTH \
+AM_CFLAGS = -DZEROWIDTH \

        -D_PATH_PAP=\"$(bindir)/pap\" \
        -D_PATH_PSORDER=\"$(bindir)/psorder\" \
        -D_PATH_PSA=\"$(libexecdir)/psa\" \
        -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 46446a374541cdbc3ab60b5ae150f1a53a26b021..64c09443b5a8978c441eb74fc9497e8f67b83c7a 100644 (file)
--- a/etc/uams/Makefile.am
+++ b/etc/uams/Makefile.am
@@ -90,18 +90,12 @@ uams_gss_la_SOURCES   = uams_gss.c
 #
 
 # do that on behalf of the brokeness of automake 1.4
 #
 
 # do that on behalf of the brokeness of automake 1.4

-AM_CFLAGS = @CFLAGS@ @SSL_CFLAGS@ @LIBGCRYPT_CFLAGS@
-
-uams_guest_la_CFLAGS      = @CFLAGS@
-uams_randnum_la_CFLAGS    = @CFLAGS@ @SSL_CFLAGS@
-uams_passwd_la_CFLAGS     = @CFLAGS@
-uams_pam_la_CFLAGS        = @CFLAGS@ @PAM_CFLAGS@
-uams_pgp_la_CFLAGS        = @CFLAGS@ @SSL_CFLAGS@
-uams_dhx_passwd_la_CFLAGS = @CFLAGS@ @SSL_CFLAGS@
-uams_dhx_pam_la_CFLAGS    = @CFLAGS@ @SSL_CFLAGS@ @PAM_CFLAGS@
-uams_dhx2_passwd_la_CFLAGS     = @CFLAGS@ @LIBGCRYPT_CFLAGS@
-uams_dhx2_pam_la_CFLAGS                = @CFLAGS@ @LIBGCRYPT_CFLAGS@ @PAM_CFLAGS@
-uams_gss_la_CFLAGS       = @CFLAGS@ @GSSAPI_CFLAGS@
+AM_CFLAGS = @SSL_CFLAGS@ @LIBGCRYPT_CFLAGS@
+
+uams_pam_la_CFLAGS         = @PAM_CFLAGS@
+uams_dhx_pam_la_CFLAGS     = @PAM_CFLAGS@
+uams_dhx2_pam_la_CFLAGS    = @PAM_CFLAGS@
+uams_gss_la_CFLAGS        = @GSSAPI_CFLAGS@

 
 uams_guest_la_LDFLAGS      = -module -avoid-version
 uams_randnum_la_LDFLAGS    = -module -avoid-version @SSL_LIBS@
 
 uams_guest_la_LDFLAGS      = -module -avoid-version
 uams_randnum_la_LDFLAGS    = -module -avoid-version @SSL_LIBS@

diff --git a/libatalk/asp/Makefile.am b/libatalk/asp/Makefile.am
index e540a3e8638dadbcbe1179db6fda3defa1d302fa..ae83084dcf9917779ef17e16766d5a4f6ce15b9d 100644 (file)
--- a/libatalk/asp/Makefile.am
+++ b/libatalk/asp/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile.am for libatalk/asp/
 
 # Makefile.am for libatalk/asp/
 

-AM_CFLAGS = -I$(top_srcdir) @CFLAGS@
+AM_CFLAGS = -I$(top_srcdir)

 
 noinst_LTLIBRARIES = libasp.la
 
 
 noinst_LTLIBRARIES = libasp.la
 

diff --git a/libatalk/tdb/Makefile.am b/libatalk/tdb/Makefile.am
index fc9dd1d4e574052f8b9490060b532eb5f01b2458..e2dc8b278ddf9bb0b8613829b9e9263df9b8d494 100644 (file)
--- a/libatalk/tdb/Makefile.am
+++ b/libatalk/tdb/Makefile.am
@@ -1,7 +1,5 @@
 # Makefile.am for libatalk/tdb/
 
 # Makefile.am for libatalk/tdb/
 

-AM_CFLAGS = @CFLAGS@ 
-

 noinst_LTLIBRARIES = libtdb.la
 
 libtdb_la_SOURCES = tdb.c \
 noinst_LTLIBRARIES = libtdb.la
 
 libtdb_la_SOURCES = tdb.c \

diff --git a/libatalk/unicode/Makefile.am b/libatalk/unicode/Makefile.am
index 39b8b85b94a00fbf642090f5489da855489f3f8e..2571399c72fca9e835414bb4a08c11a8c3682b74 100644 (file)
--- a/libatalk/unicode/Makefile.am
+++ b/libatalk/unicode/Makefile.am
@@ -2,7 +2,7 @@
 
 noinst_LTLIBRARIES = libunicode.la
 
 
 noinst_LTLIBRARIES = libunicode.la
 

-AM_CFLAGS = -I$(top_srcdir)/sys @CFLAGS@ @ICONV_CFLAGS@
+AM_CFLAGS = -I$(top_srcdir)/sys @ICONV_CFLAGS@

 
 SUBDIRS = charsets
 
 
 SUBDIRS = charsets
 

diff --git a/libatalk/util/Makefile.am b/libatalk/util/Makefile.am
index 2ae09252bbf26df1b529ae1845fbc3a35ed2eb81..5ba5f2d547a60c42dc6520237c6418b682009913 100644 (file)
--- a/libatalk/util/Makefile.am
+++ b/libatalk/util/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = . test
 
 noinst_LTLIBRARIES = libutil.la
 
 
 noinst_LTLIBRARIES = libutil.la
 

-AM_CFLAGS = -I$(top_srcdir)/sys @CFLAGS@
+AM_CFLAGS = -I$(top_srcdir)/sys

 
 libutil_la_SOURCES = \
        atalk_addr.c    \
 
 libutil_la_SOURCES = \
        atalk_addr.c    \