From: franklahm Date: Mon, 19 Oct 2009 12:27:26 +0000 (+0000) Subject: Dont duplicate CFLAGS in AM_CFLAGS. Inspired by Jonas Smedegaard. X-Git-Tag: before-ipv6~66 X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=968472296b2d9048c99645e926aafa57895f632a;p=netatalk.git Dont duplicate CFLAGS in AM_CFLAGS. Inspired by Jonas Smedegaard. --- diff --git a/bin/afppasswd/Makefile.am b/bin/afppasswd/Makefile.am index 9a295983..cab2df66 100644 --- 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@ -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: diff --git a/contrib/a2boot/Makefile.am b/contrib/a2boot/Makefile.am index c4139bb7..9ab8cba9 100644 --- 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 \ - @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\" diff --git a/contrib/acltests/Makefile.am b/contrib/acltests/Makefile.am index 75eba006..a8736f85 100644 --- 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 -AM_CFLAGS = @CFLAGS@ -D_PATH_ACL_LDAPCONF=\"$(pkgconfdir)/ldap.conf\" +AM_CFLAGS = -D_PATH_ACL_LDAPCONF=\"$(pkgconfdir)/ldap.conf\" endif diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am index 87228109..4221e47e 100644 --- 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 \ - @CFLAGS@ @SLP_CFLAGS@ \ + @SLP_CFLAGS@ \ -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 56eadfb2..098a5297 100644 --- a/etc/atalkd/Makefile.am +++ b/etc/atalkd/Makefile.am @@ -19,4 +19,4 @@ noinst_HEADERS = \ 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 eeb8b6f7..d3af2bbb 100644 --- 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 -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 diff --git a/etc/papd/Makefile.am b/etc/papd/Makefile.am index 34dee05a..6a09abdb 100644 --- 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 -showppd_CFLAGS = @CFLAGS@ -DSHOWPPD +showppd_CFLAGS = -DSHOWPPD 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 \ - @CFLAGS@ @CUPS_CFLAGS@\ + @CUPS_CFLAGS@\ -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 46ed3c39..8cb795a9 100644 --- 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 -AM_CFLAGS = @CFLAGS@ -DZEROWIDTH \ +AM_CFLAGS = -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 46446a37..64c09443 100644 --- 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 -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@ diff --git a/libatalk/asp/Makefile.am b/libatalk/asp/Makefile.am index e540a3e8..ae83084d 100644 --- a/libatalk/asp/Makefile.am +++ b/libatalk/asp/Makefile.am @@ -1,6 +1,6 @@ # Makefile.am for libatalk/asp/ -AM_CFLAGS = -I$(top_srcdir) @CFLAGS@ +AM_CFLAGS = -I$(top_srcdir) noinst_LTLIBRARIES = libasp.la diff --git a/libatalk/tdb/Makefile.am b/libatalk/tdb/Makefile.am index fc9dd1d4..e2dc8b27 100644 --- a/libatalk/tdb/Makefile.am +++ b/libatalk/tdb/Makefile.am @@ -1,7 +1,5 @@ # Makefile.am for libatalk/tdb/ -AM_CFLAGS = @CFLAGS@ - noinst_LTLIBRARIES = libtdb.la libtdb_la_SOURCES = tdb.c \ diff --git a/libatalk/unicode/Makefile.am b/libatalk/unicode/Makefile.am index 39b8b85b..2571399c 100644 --- a/libatalk/unicode/Makefile.am +++ b/libatalk/unicode/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libunicode.la -AM_CFLAGS = -I$(top_srcdir)/sys @CFLAGS@ @ICONV_CFLAGS@ +AM_CFLAGS = -I$(top_srcdir)/sys @ICONV_CFLAGS@ SUBDIRS = charsets diff --git a/libatalk/util/Makefile.am b/libatalk/util/Makefile.am index 2ae09252..5ba5f2d5 100644 --- a/libatalk/util/Makefile.am +++ b/libatalk/util/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = . test noinst_LTLIBRARIES = libutil.la -AM_CFLAGS = -I$(top_srcdir)/sys @CFLAGS@ +AM_CFLAGS = -I$(top_srcdir)/sys libutil_la_SOURCES = \ atalk_addr.c \