remove automake warnings, from Houritsu Chu

diff --git a/bin/afppasswd/Makefile.am b/bin/afppasswd/Makefile.am
index b9fad222a1e4d4f76243de6e9203b4d8df8c12f3..4e4a5ef8a1384d532ef3cbd48cc637a9d7b19fc0 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 \
+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 21ed2fd55d63247a7f3baf23d65e49fb6d7b4ba6..59eb0bcc98f0ef9470bce0797cbe08d9db8a7315 100644 (file)
--- 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 02d583cad26de3182267fb9bc6819d4389d0fe50..c4139bb7c75fe2cc979ae5be32ea9e432f14164f 100644 (file)
--- 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 7da1ad0650b96a19a78506e5f924a45ef176c76b..764b8475e77a73c4741c61fdb2eca39b6c089ba4 100644 (file)
--- 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 2e0a18d3f447906c83a50acecae72821cf74c365..56eadfb25103e3d09ff03ce4dcbc441e1f65d656 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\"
+AM_CFLAGS = @CFLAGS@ -D_PATH_ATALKDCONF=\"$(pkgconfdir)/atalkd.conf\"

diff --git a/etc/cnid_dbd/Makefile.am b/etc/cnid_dbd/Makefile.am
index 7ea9d0721de80a99a3910a7f074d57e3fd530ab0..20051a6e3404e23dc81ef2dfd4b9c6d7676e8e5d 100644 (file)
--- 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 8f5c5697e33c472c3d274af630210852905cea63..34dee05a5d1c9375cd780aa28b482568103f1894 100644 (file)
--- 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 0769919bd26ffed26ade0b0a6052e9b738cc88be..46ed3c39d213c3759d9ccc0be56f33181bed0e2d 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 \
+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 55cba1af64619987bafe0742654072be9f2ec32d..d3e35108cc65b98aa1020311bbddd03024fe5ba0 100644 (file)
--- 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 ffc53876d48f156836b750ff2a1f3c9057bc8ef0..e540a3e8638dadbcbe1179db6fda3defa1d302fa 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@
+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 6a04a541e61c03e47fb536b6261dc9b6eb8e77ae..555e252a4f9d610c54708eb192b0767faaf3bc69 100644 (file)
--- 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 f05fe81fea77852de6fceb122af146082e2f1173..df502f9e886f0f5ac1dfd01e4b95f174fbcfdbf1 100644 (file)
--- 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 78be1af9455a44b349059a8fe854e963814d4a7e..fc9dd1d4e574052f8b9490060b532eb5f01b2458 100644 (file)
--- 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 9b8ba09f4157997e7a69ad18953a31df62194c46..39b8b85b94a00fbf642090f5489da855489f3f8e 100644 (file)
--- 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 d46f28e1da7e3b4d3d4231d838903307f080f990..6114720fe3cce0071115d891e376e74c2748ed18 100644 (file)
--- 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 3a83debc1fdc7b5b7e1c67159e367c462039500b..e9feba13b17183fb7a62e2035404e3c5698e9ea8 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@
+AM_CFLAGS = -I$(top_srcdir)/sys @CFLAGS@
 
 libutil_la_SOURCES = \
        atalk_addr.c    \