some automake updates to Makefile.amHEADmaster

4 files changed, 9 insertions, 8 deletions

diff --git a/examples/csoap/Makefile.am b/examples/csoap/Makefile.am
index d670f3c..5aca054 100644
--- a/examples/csoap/Makefile.am
+++ b/examples/csoap/Makefile.am
@@ -2,7 +2,7 @@
 # $Revision: 1.12 $
 #
 LDADD=../../nanohttp/libnanohttp.la ../../libcsoap/libcsoap.la
-INCLUDES=-I${top_srcdir}
+AM_CPPFLAGS=-I${top_srcdir}
 
 noinst_PROGRAMS=simpleclient \
                 simpleserver \
diff --git a/examples/nanohttp/Makefile.am b/examples/nanohttp/Makefile.am
index bb92e1d..91d79f6 100644
--- a/examples/nanohttp/Makefile.am
+++ b/examples/nanohttp/Makefile.am
@@ -2,7 +2,7 @@
 # $Revision: 1.15 $
 #
 LDADD=../../nanohttp/libnanohttp.la
-INCLUDES=-I${top_srcdir}
+AM_CPPFLAGS=-I${top_srcdir}
 
 noinst_PROGRAMS=http_server http_client mime_client
 
diff --git a/wsdl2c/Makefile.am b/wsdl2c/Makefile.am
index 74a1ac0..3660d13 100755
--- a/wsdl2c/Makefile.am
+++ b/wsdl2c/Makefile.am
@@ -4,8 +4,8 @@
 
 bin_PROGRAMS=wsdl2c
 
-INCLUDES=$(libxml2_CFLAGS) -I$(top_srcdir)
-wsdl2cl_LDFLAG=$(libxml2_LIBS)
+AM_CPPFLAGS=$(libxml2_CFLAGS) -I$(top_srcdir)
+AM_LDFLAGS=$(libxml2_LIBS)
 
 xsd2c_root= $(top_srcdir)/xsd2c
 
@@ -17,5 +17,5 @@ xsd2c_objs=../xsd2c/util.o \
 ../xsd2c/Enumeration.o
 
 wsdl2c_SOURCES=CallVar.c CallFunc.c CallList.c codewriter.c wsdl2c.c 
-wsdl2c_LDFLAGS=$(wsdl2cl_LDFLAG) $(xsd2c_objs)
+wsdl2c_LDFLAGS=$(AM_LDFLAGS) $(xsd2c_objs)
 
diff --git a/xsd2c/Makefile.am b/xsd2c/Makefile.am
index 8a19b30..aa8de47 100755
--- a/xsd2c/Makefile.am
+++ b/xsd2c/Makefile.am
@@ -3,9 +3,10 @@
 #
 bin_PROGRAMS=xsd2c
 
-INCLUDES=$(libxml2_CFLAGS) -I$(top_srcdir)
-x_LDFLAG=$(libxml2_LIBS)
+AM_CPPFLAGS=-I$(top_srcdir)
+AM_CFLAGS=$(libxml2_CFLAGS) 
+AM_LDFLAGS=$(libxml2_LIBS)
 
 xsd2c_SOURCES=tr.c Enumeration.c util.c obj.c formatter.c xsd2c.c main.c
-xsd2c_LDFLAGS=$(x_LDFLAG)
+xsd2c_LDFLAGS=$(AM_LDFLAGS)