From 9b9d13550d99f2ea86633550cc3ca60f433f8e22 Mon Sep 17 00:00:00 2001
From: didg <didg>
Date: Sat, 30 Sep 2006 06:29:17 +0000
Subject: [PATCH] remove automake warnings, from Houritsu Chu

---
 bin/afppasswd/Makefile.am             | 4 ++--
 bin/cnid/Makefile.am                  | 4 ++--
 contrib/a2boot/Makefile.am            | 2 +-
 etc/afpd/Makefile.am                  | 2 +-
 etc/atalkd/Makefile.am                | 2 +-
 etc/cnid_dbd/Makefile.am              | 2 +-
 etc/papd/Makefile.am                  | 4 ++--
 etc/psf/Makefile.am                   | 2 +-
 etc/uams/Makefile.am                  | 2 +-
 libatalk/asp/Makefile.am              | 2 +-
 libatalk/cnid/cdb/Makefile.am         | 2 +-
 libatalk/cnid/db3/Makefile.am         | 2 +-
 libatalk/tdb/Makefile.am              | 2 +-
 libatalk/unicode/Makefile.am          | 2 +-
 libatalk/unicode/charsets/Makefile.am | 2 +-
 libatalk/util/Makefile.am             | 2 +-
 16 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/bin/afppasswd/Makefile.am b/bin/afppasswd/Makefile.am
index b9fad222..4e4a5ef8 100644
--- 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 \
+AM_CFLAGS = @CFLAGS@ @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/cnid/Makefile.am b/bin/cnid/Makefile.am
index 21ed2fd5..59eb0bcc 100644
--- a/bin/cnid/Makefile.am
+++ b/bin/cnid/Makefile.am
@@ -15,5 +15,5 @@ cnid_index_SOURCES = cnid_index.c
 cnid_index_LDADD = $(top_builddir)/libatalk/libatalk.la
 
 LIBS = @LIBS@ @BDB_LIBS@
- 
-CFLAGS = @CFLAGS@ @BDB_CFLAGS@ 
+
+AM_CFLAGS = @CFLAGS@ @BDB_CFLAGS@ 
diff --git a/contrib/a2boot/Makefile.am b/contrib/a2boot/Makefile.am
index 02d583ca..c4139bb7 100644
--- a/contrib/a2boot/Makefile.am
+++ b/contrib/a2boot/Makefile.am
@@ -9,7 +9,7 @@ LIBS = @LIBS@
 
 EXTRA_DIST = COPYRIGHT VERSION
 
-CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys \
+AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys \
 	 @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\" \
diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 7da1ad06..764b8475 100644
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -19,7 +19,7 @@ noinst_HEADERS = auth.h afp_config.h desktop.h directory.h file.h \
 
 LIBS = @LIBS@ @QUOTA_LIBS@ @SLP_LIBS@ @WRAP_LIBS@ @LIBADD_DL@
 
-CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys \
+AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys \
 	 @CFLAGS@ @SLP_CFLAGS@ \
 	 -D_PATH_AFPDDEFVOL=\"$(pkgconfdir)/AppleVolumes.default\" \
 	 -D_PATH_AFPDSYSVOL=\"$(pkgconfdir)/AppleVolumes.system\" \
diff --git a/etc/atalkd/Makefile.am b/etc/atalkd/Makefile.am
index 2e0a18d3..56eadfb2 100644
--- 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\"
+AM_CFLAGS = @CFLAGS@ -D_PATH_ATALKDCONF=\"$(pkgconfdir)/atalkd.conf\"
diff --git a/etc/cnid_dbd/Makefile.am b/etc/cnid_dbd/Makefile.am
index 7ea9d072..20051a6e 100644
--- a/etc/cnid_dbd/Makefile.am
+++ b/etc/cnid_dbd/Makefile.am
@@ -22,5 +22,5 @@ noinst_HEADERS = dbif.h pack.h db_param.h dbd.h usockfd.h comm.h
 EXTRA_DIST = README
 
 
-CFLAGS = @CFLAGS@ @BDB_CFLAGS@ \
+AM_CFLAGS = @CFLAGS@ @BDB_CFLAGS@ \
          -D_PATH_CNID_DBD=\"$(sbindir)/cnid_dbd\"
diff --git a/etc/papd/Makefile.am b/etc/papd/Makefile.am
index 8f5c5697..34dee05a 100644
--- a/etc/papd/Makefile.am
+++ b/etc/papd/Makefile.am
@@ -27,12 +27,12 @@ noinst_HEADERS =	\
 	print_cups.h	\
 	uam_auth.h
 
-CFLAGS = \
+AM_CFLAGS = \
 	-I$(top_srcdir)/include -I$(top_srcdir)/sys \
 	@CFLAGS@ @CUPS_CFLAGS@\
 	-D_PATH_PAPDCONF=\"$(pkgconfdir)/papd.conf\" \
 	-D_PATH_PAPDUAMPATH=\"$(UAMS_PATH)/\" \
- 	-DSPOOLDIR=\"$(spooldir)/\"
+	-DSPOOLDIR=\"$(spooldir)/\"
 
 if USE_SPOOLDIR
 install-exec-hook:
diff --git a/etc/psf/Makefile.am b/etc/psf/Makefile.am
index 0769919b..46ed3c39 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
 
-CFLAGS = @CFLAGS@ -DZEROWIDTH \
+AM_CFLAGS = @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 55cba1af..d3e35108 100644
--- a/etc/uams/Makefile.am
+++ b/etc/uams/Makefile.am
@@ -54,7 +54,7 @@ uams_gss_la_SOURCES   = uams_gss.c
 #
 
 # do that on behalf of the brokeness of automake 1.4
-CFLAGS = @CFLAGS@ @SSL_CFLAGS@
+AM_CFLAGS = @CFLAGS@ @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 ffc53876..e540a3e8 100644
--- a/libatalk/asp/Makefile.am
+++ b/libatalk/asp/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile.am for libatalk/asp/
 
-CFLAGS = -I$(top_srcdir) @CFLAGS@
+AM_CFLAGS = -I$(top_srcdir) @CFLAGS@
 
 noinst_LTLIBRARIES = libasp.la
 
diff --git a/libatalk/cnid/cdb/Makefile.am b/libatalk/cnid/cdb/Makefile.am
index 6a04a541..555e252a 100644
--- a/libatalk/cnid/cdb/Makefile.am
+++ b/libatalk/cnid/cdb/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile.am for libatalk/cnid/
 
-CFLAGS = @CFLAGS@ @BDB_CFLAGS@
+AM_CFLAGS = @CFLAGS@ @BDB_CFLAGS@
 
 noinst_LTLIBRARIES = libcnid_cdb.la
 if USE_CDB_BACKEND
diff --git a/libatalk/cnid/db3/Makefile.am b/libatalk/cnid/db3/Makefile.am
index f05fe81f..df502f9e 100644
--- a/libatalk/cnid/db3/Makefile.am
+++ b/libatalk/cnid/db3/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile.am for libatalk/cnid/
 
-CFLAGS = @CFLAGS@ @BDB_CFLAGS@
+AM_CFLAGS = @CFLAGS@ @BDB_CFLAGS@
 
 noinst_LTLIBRARIES = libcnid_db3.la
 if USE_CDB_BACKEND
diff --git a/libatalk/tdb/Makefile.am b/libatalk/tdb/Makefile.am
index 78be1af9..fc9dd1d4 100644
--- a/libatalk/tdb/Makefile.am
+++ b/libatalk/tdb/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile.am for libatalk/tdb/
 
-CFLAGS = @CFLAGS@ 
+AM_CFLAGS = @CFLAGS@ 
 
 noinst_LTLIBRARIES = libtdb.la
 
diff --git a/libatalk/unicode/Makefile.am b/libatalk/unicode/Makefile.am
index 9b8ba09f..39b8b85b 100644
--- a/libatalk/unicode/Makefile.am
+++ b/libatalk/unicode/Makefile.am
@@ -2,7 +2,7 @@
 
 noinst_LTLIBRARIES = libunicode.la
 
-CFLAGS = -I$(top_srcdir)/sys @CFLAGS@ @ICONV_CFLAGS@
+AM_CFLAGS = -I$(top_srcdir)/sys @CFLAGS@ @ICONV_CFLAGS@
 
 SUBDIRS = charsets
 
diff --git a/libatalk/unicode/charsets/Makefile.am b/libatalk/unicode/charsets/Makefile.am
index d46f28e1..6114720f 100644
--- a/libatalk/unicode/charsets/Makefile.am
+++ b/libatalk/unicode/charsets/Makefile.am
@@ -2,7 +2,7 @@
 
 noinst_LTLIBRARIES = libcharsets.la
 
-CFLAGS = -I$(top_srcdir)/sys @CFLAGS@ @ICONV_CFLAGS@
+AM_CFLAGS = -I$(top_srcdir)/sys @CFLAGS@ @ICONV_CFLAGS@
 LIBS = 
 
 libcharsets_la_SOURCES = \
diff --git a/libatalk/util/Makefile.am b/libatalk/util/Makefile.am
index 3a83debc..e9feba13 100644
--- a/libatalk/util/Makefile.am
+++ b/libatalk/util/Makefile.am
@@ -2,7 +2,7 @@
 
 noinst_LTLIBRARIES = libutil.la
 
-CFLAGS = -I$(top_srcdir)/sys @CFLAGS@
+AM_CFLAGS = -I$(top_srcdir)/sys @CFLAGS@
 
 libutil_la_SOURCES = \
 	atalk_addr.c	\
-- 
2.39.2