Author: billblough
Date: Fri Jan 17 18:56:10 2020
New Revision: 1872931

URL: http://svn.apache.org/viewvc?rev=1872931&view=rev
Log:
Fix autotools warnings about INCLUDES

Modified:
    axis/axis2/c/core/trunk/axiom/src/attachments/Makefile.am
    axis/axis2/c/core/trunk/axiom/src/om/Makefile.am
    axis/axis2/c/core/trunk/axiom/src/parser/guththila/Makefile.am
    axis/axis2/c/core/trunk/axiom/src/parser/libxml2/Makefile.am
    axis/axis2/c/core/trunk/axiom/src/soap/Makefile.am
    axis/axis2/c/core/trunk/axiom/src/util/Makefile.am
    axis/axis2/c/core/trunk/axiom/src/xpath/Makefile.am
    axis/axis2/c/core/trunk/guththila/src/Makefile.am
    axis/axis2/c/core/trunk/neethi/src/Makefile.am
    axis/axis2/c/core/trunk/neethi/src/rmpolicy/Makefile.am
    axis/axis2/c/core/trunk/neethi/src/secpolicy/builder/Makefile.am
    axis/axis2/c/core/trunk/neethi/src/secpolicy/model/Makefile.am
    axis/axis2/c/core/trunk/samples/client/amqp/echo/Makefile.am
    axis/axis2/c/core/trunk/samples/client/amqp/mtom/Makefile.am
    axis/axis2/c/core/trunk/samples/client/amqp/notify/Makefile.am
    axis/axis2/c/core/trunk/samples/client/echo/Makefile.am
    axis/axis2/c/core/trunk/samples/client/google/Makefile.am
    axis/axis2/c/core/trunk/samples/client/math/Makefile.am
    axis/axis2/c/core/trunk/samples/client/mtom/Makefile.am
    axis/axis2/c/core/trunk/samples/client/mtom_callback/Makefile.am
    axis/axis2/c/core/trunk/samples/client/notify/Makefile.am
    axis/axis2/c/core/trunk/samples/client/ntlm/Makefile.am
    axis/axis2/c/core/trunk/samples/client/session/Makefile.am
    axis/axis2/c/core/trunk/samples/client/version/Makefile.am
    axis/axis2/c/core/trunk/samples/client/yahoo/Makefile.am
    axis/axis2/c/core/trunk/samples/codegen/client/calc_xml_inout/Makefile.am
    axis/axis2/c/core/trunk/samples/codegen/client/calculator/Makefile.am
    axis/axis2/c/core/trunk/samples/codegen/client/interop_doc1/Makefile.am
    axis/axis2/c/core/trunk/samples/codegen/client/interop_doc2/Makefile.am
    axis/axis2/c/core/trunk/samples/codegen/server/calc_xml_inout/Makefile.am
    axis/axis2/c/core/trunk/samples/codegen/server/calculator/Makefile.am
    axis/axis2/c/core/trunk/samples/codegen/server/interop_doc1/Makefile.am
    axis/axis2/c/core/trunk/samples/codegen/server/interop_doc2/Makefile.am
    axis/axis2/c/core/trunk/samples/mtom_caching_callback/Makefile.am
    axis/axis2/c/core/trunk/samples/mtom_sending_callback/Makefile.am
    axis/axis2/c/core/trunk/samples/server/Calculator/Makefile.am
    axis/axis2/c/core/trunk/samples/server/echo/Makefile.am
    axis/axis2/c/core/trunk/samples/server/math/Makefile.am
    axis/axis2/c/core/trunk/samples/server/mtom/Makefile.am
    axis/axis2/c/core/trunk/samples/server/mtom_callback/Makefile.am
    axis/axis2/c/core/trunk/samples/server/notify/Makefile.am
    axis/axis2/c/core/trunk/samples/server/session/Makefile.am
    axis/axis2/c/core/trunk/samples/server/sg_math/Makefile.am
    axis/axis2/c/core/trunk/samples/server/version/Makefile.am
    axis/axis2/c/core/trunk/samples/user_guide/clients/Makefile.am
    axis/axis2/c/core/trunk/src/core/addr/Makefile.am
    axis/axis2/c/core/trunk/src/core/clientapi/Makefile.am
    axis/axis2/c/core/trunk/src/core/context/Makefile.am
    axis/axis2/c/core/trunk/src/core/deployment/Makefile.am
    axis/axis2/c/core/trunk/src/core/description/Makefile.am
    axis/axis2/c/core/trunk/src/core/engine/Makefile.am
    axis/axis2/c/core/trunk/src/core/phaseresolver/Makefile.am
    axis/axis2/c/core/trunk/src/core/receivers/Makefile.am
    axis/axis2/c/core/trunk/src/core/transport/amqp/receiver/Makefile.am
    
axis/axis2/c/core/trunk/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am
    
axis/axis2/c/core/trunk/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am
    axis/axis2/c/core/trunk/src/core/transport/amqp/sender/Makefile.am
    
axis/axis2/c/core/trunk/src/core/transport/amqp/sender/qpid_sender/Makefile.am
    
axis/axis2/c/core/trunk/src/core/transport/amqp/server/axis2_amqp_server/Makefile.am
    axis/axis2/c/core/trunk/src/core/transport/amqp/util/Makefile.am
    axis/axis2/c/core/trunk/src/core/transport/http/common/Makefile.am
    axis/axis2/c/core/trunk/src/core/transport/http/receiver/Makefile.am
    axis/axis2/c/core/trunk/src/core/transport/http/sender/Makefile.am
    
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/default/Makefile.am
    
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/heimdal/Makefile.am
    
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/libntlm/Makefile.am
    axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/test/Makefile.am
    
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/test/mock_server/Makefile.am
    axis/axis2/c/core/trunk/src/core/transport/http/server/CGI/Makefile.am
    axis/axis2/c/core/trunk/src/core/transport/http/server/apache2/Makefile.am
    
axis/axis2/c/core/trunk/src/core/transport/http/server/simple_axis2_server/Makefile.am
    axis/axis2/c/core/trunk/src/core/transport/http/util/Makefile.am
    axis/axis2/c/core/trunk/src/core/transport/tcp/receiver/Makefile.am
    axis/axis2/c/core/trunk/src/core/transport/tcp/sender/Makefile.am
    
axis/axis2/c/core/trunk/src/core/transport/tcp/server/simple_tcp_server/Makefile.am
    axis/axis2/c/core/trunk/src/core/util/Makefile.am
    axis/axis2/c/core/trunk/src/modules/mod_addr/Makefile.am
    axis/axis2/c/core/trunk/src/modules/mod_log/Makefile.am
    axis/axis2/c/core/trunk/test/itest/whitemesa/round1/Makefile.am
    axis/axis2/c/core/trunk/test/itest/whitemesa/round2/Makefile.am
    axis/axis2/c/core/trunk/tools/md5/src/Makefile.am
    axis/axis2/c/core/trunk/tools/tcpmon/src/Makefile.am
    axis/axis2/c/core/trunk/tools/tcpmon/test/unit/Makefile.am
    axis/axis2/c/core/trunk/util/src/Makefile.am
    axis/axis2/c/core/trunk/util/src/minizip/Makefile.am
    axis/axis2/c/core/trunk/util/src/platforms/unix/Makefile.am
    axis/axis2/c/core/trunk/util/test/allocator/Makefile.am

Modified: axis/axis2/c/core/trunk/axiom/src/attachments/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/axiom/src/attachments/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/axiom/src/attachments/Makefile.am (original)
+++ axis/axis2/c/core/trunk/axiom/src/attachments/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 noinst_LTLIBRARIES = libaxis2_attachments.la
-AM_CPPFLAGS = $(CPPFLAGS)
 libaxis2_attachments_la_SOURCES = mime_part.c \
                                        data_handler.c \
                                        mime_body_part.c \
@@ -21,9 +20,9 @@ libaxis2_attachments_la_SOURCES = mime_p
 
 libaxis2_attachments_la_LIBADD = $(top_builddir)/../util/src/libaxutil.la 
 
-INCLUDES =     -I$(top_srcdir)/include \
-            -I$(top_srcdir)/parser \
-                       -I$(top_srcdir)/../util/include
+libaxis2_attachments_la_CPPFLAGS =     -I$(top_srcdir)/include \
+                                                                       
-I$(top_srcdir)/parser \
+                                                                       
-I$(top_srcdir)/../util/include
 
 EXTRA_DIST = axiom_mime_body_part.h 
 

Modified: axis/axis2/c/core/trunk/axiom/src/om/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/axiom/src/om/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/axiom/src/om/Makefile.am (original)
+++ axis/axis2/c/core/trunk/axiom/src/om/Makefile.am Fri Jan 17 18:56:10 2020
@@ -39,12 +39,12 @@ libaxis2_axiom_la_LIBADD =  $(top_builddi
 
 libaxis2_axiom_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES =     -I$(top_srcdir)/include \
-            -I$(top_srcdir)/src/parser \
-            -I$(top_srcdir)/src/om \
-            -I$(top_srcdir)/src/attachments \
-                       -I$(top_srcdir)/src/soap \
-                       -I$(top_srcdir)/../util/include 
+libaxis2_axiom_la_CPPFLAGS =   -I$(top_srcdir)/include \
+                                                               
-I$(top_srcdir)/src/parser \
+                                                               
-I$(top_srcdir)/src/om \
+                                                               
-I$(top_srcdir)/src/attachments \
+                                                               
-I$(top_srcdir)/src/soap \
+                                                               
-I$(top_srcdir)/../util/include 
 
 EXTRA_DIST = axiom_namespace_internal.h  axiom_node_internal.h  
axiom_stax_builder_internal.h axiom_document_internal.h axiom_element_internal.h
 

Modified: axis/axis2/c/core/trunk/axiom/src/parser/guththila/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/axiom/src/parser/guththila/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/axiom/src/parser/guththila/Makefile.am (original)
+++ axis/axis2/c/core/trunk/axiom/src/parser/guththila/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -22,6 +22,6 @@ libaxis2_parser_la_SOURCES = ../xml_read
 
 libaxis2_parser_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES = -I$(top_srcdir)/include \
-                       -I $(top_srcdir)/../util/include \
-                       -I $(top_srcdir)/../guththila/include
+libaxis2_parser_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                         -I 
$(top_srcdir)/../util/include \
+                                                         -I 
$(top_srcdir)/../guththila/include

Modified: axis/axis2/c/core/trunk/axiom/src/parser/libxml2/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/axiom/src/parser/libxml2/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/axiom/src/parser/libxml2/Makefile.am (original)
+++ axis/axis2/c/core/trunk/axiom/src/parser/libxml2/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -24,7 +24,7 @@ libaxis2_parser_la_LIBADD = @LIBXML2_LIB
 libaxis2_parser_la_LDFLAGS = -version-info $(VERSION_NO)
 
 
-INCLUDES = -I$(top_srcdir)/include \
-            -I$(top_srcdir)/src/parser \
-            -I$(top_srcdir)/../util/include \
-                       @LIBXML2_CFLAGS@
+libaxis2_parse_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                        
-I$(top_srcdir)/src/parser \
+                                                        
-I$(top_srcdir)/../util/include \
+                                                        @LIBXML2_CFLAGS@

Modified: axis/axis2/c/core/trunk/axiom/src/soap/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/axiom/src/soap/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/axiom/src/soap/Makefile.am (original)
+++ axis/axis2/c/core/trunk/axiom/src/soap/Makefile.am Fri Jan 17 18:56:10 2020
@@ -31,10 +31,10 @@ libaxis2_soap_la_SOURCES = soap_fault.c
                            soap12_builder_helper.c
 
 libaxis2_soap_la_LIBADD = 
-INCLUDES = -I$(top_srcdir)/include \
-            -I$(top_srcdir)/src/parser \
-            -I$(top_srcdir)/src/om \
-                       -I$(top_srcdir)/../util/include
+libaxis2_soap_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                       
-I$(top_srcdir)/src/parser \
+                                                       -I$(top_srcdir)/src/om \
+                                                       
-I$(top_srcdir)/../util/include
 
 EXTRA_DIST =     axiom_soap11_builder_helper.h axiom_soap_builder_internal.h \
                _axiom_soap_fault_code.h _axiom_soap_fault_reason.h \

Modified: axis/axis2/c/core/trunk/axiom/src/util/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/axiom/src/util/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/axiom/src/util/Makefile.am (original)
+++ axis/axis2/c/core/trunk/axiom/src/util/Makefile.am Fri Jan 17 18:56:10 2020
@@ -16,7 +16,7 @@ noinst_LTLIBRARIES = libaxis2_axiom_util
 libaxis2_axiom_util_la_SOURCES =       om_util.c
 
 libaxis2_axiom_util_la_LIBADD = 
-INCLUDES = -I$(top_srcdir)/include \
-            -I$(top_srcdir)/src/parser \
-            -I$(top_srcdir)/src/om \
-                       -I$(top_srcdir)/../util/include
+libaxis2_axiom_util_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                                 
-I$(top_srcdir)/src/parser \
+                                                                 
-I$(top_srcdir)/src/om \
+                                                                 
-I$(top_srcdir)/../util/include

Modified: axis/axis2/c/core/trunk/axiom/src/xpath/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/axiom/src/xpath/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/axiom/src/xpath/Makefile.am (original)
+++ axis/axis2/c/core/trunk/axiom/src/xpath/Makefile.am Fri Jan 17 18:56:10 2020
@@ -24,11 +24,12 @@ libaxis2_xpath_la_SOURCES = xpath.c \
 libaxis2_xpath_la_LDFLAGS = -version-info $(VERSION_NO)
 
 libaxis2_xpath_la_LIBADD = 
-INCLUDES = -I$(top_srcdir)/include \
-            -I$(top_srcdir)/src/parser \
-            -I$(top_srcdir)/src/om \
-                       -I$(top_srcdir)/../util/include \
-                       -I$(top_srcdir)/../include
+
+libaxis2_xpath_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                        
-I$(top_srcdir)/src/parser \
+                                                        -I$(top_srcdir)/src/om 
\
+                                                        
-I$(top_srcdir)/../util/include \
+                                                        
-I$(top_srcdir)/../include
 
 EXTRA_DIST =    xpath_functions.h  xpath_internals_engine.h \
                xpath_internals.h  xpath_internals_iterators.h \

Modified: axis/axis2/c/core/trunk/guththila/src/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/guththila/src/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/guththila/src/Makefile.am (original)
+++ axis/axis2/c/core/trunk/guththila/src/Makefile.am Fri Jan 17 18:56:10 2020
@@ -27,6 +27,6 @@ libguththila_la_SOURCES = guththila_buff
 
 libguththila_la_LIBADD = ../../util/src/libaxutil.la
 
-INCLUDES = -I$(top_srcdir)/include \
-                  -I$(top_srcdir)/../util/include
+libguththila_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                  
-I$(top_srcdir)/../util/include
 

Modified: axis/axis2/c/core/trunk/neethi/src/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/neethi/src/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/neethi/src/Makefile.am (original)
+++ axis/axis2/c/core/trunk/neethi/src/Makefile.am Fri Jan 17 18:56:10 2020
@@ -33,35 +33,11 @@ libneethi_la_LIBADD  = $(top_builddir)/.
                        $(top_builddir)/src/secpolicy/model/librp_model.la \
                        $(top_builddir)/src/rmpolicy/librm_policy.la
 
-#libneethi_LIBADD=$(top_builddir)/src/core/description/libaxis2_description.la 
\
-#                    $(top_builddir)/src/core/receivers/libaxis2_receivers.la \
-#                                      
$(top_builddir)/src/core/deployment/libaxis2_deployment.la \
-#                                      
$(top_builddir)/src/core/context/libaxis2_context.la \
-#                                      
$(top_builddir)/src/core/addr/libaxis2_addr.la \
-#                                      
$(top_builddir)/src/core/clientapi/libaxis2_clientapi.la \
-#                                      
$(top_builddir)/src/core/phaseresolver/libaxis2_phaseresolver.la \
-#                                      
$(top_builddir)/src/core/util/libaxis2_core_utils.la \
-#                                      
$(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la \
-#                                      
$(top_builddir)/src/core/transport/http/util/libaxis2_http_util.la \
-#                                      $(top_builddir)/util/src/libaxutil.la \
-#                                      
$(top_builddir)/axiom/src/om/libaxis2_axiom.la 
-
 
 libneethi_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES = -I$(top_srcdir)/include \
-               -I $(top_srcdir)/../util/include \
-               -I $(top_srcdir)/../axiom/include \
-               -I $(top_srcdir)/../include
-
-#            -I$(top_builddir)/src/wsdl \
-#            -I$(top_builddir)/src/core/description \
-#            -I$(top_builddir)/src/core/engine \
-#            -I$(top_builddir)/src/core/phaseresolver \
-#            -I$(top_builddir)/src/core/deployment \
-#            -I$(top_builddir)/src/core/context \
-#            -I$(top_builddir)/src/core/util \
-#            -I$(top_builddir)/src/core/clientapi \
-#            -I$(top_builddir)/util/include \
-#            -I$(top_builddir)/axiom/include
+libneethi_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                               -I 
$(top_srcdir)/../util/include \
+                                               -I 
$(top_srcdir)/../axiom/include \
+                                               -I $(top_srcdir)/../include
 

Modified: axis/axis2/c/core/trunk/neethi/src/rmpolicy/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/neethi/src/rmpolicy/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/neethi/src/rmpolicy/Makefile.am (original)
+++ axis/axis2/c/core/trunk/neethi/src/rmpolicy/Makefile.am Fri Jan 17 18:56:10 
2020
@@ -20,7 +20,7 @@ librm_policy_la_SOURCES = rm_assertion.c
 
 librm_policy_la_LIBADD  = $(top_builddir)/../util/src/libaxutil.la
 
-INCLUDES = -I$(top_srcdir)/include \
-                       -I $(top_srcdir)/../include \
-                       -I $(top_srcdir)/../util/include \
-               -I $(top_srcdir)/../axiom/include
+librm_policy_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                  -I $(top_srcdir)/../include \
+                                                  -I 
$(top_srcdir)/../util/include \
+                                                  -I 
$(top_srcdir)/../axiom/include

Modified: axis/axis2/c/core/trunk/neethi/src/secpolicy/builder/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/neethi/src/secpolicy/builder/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/neethi/src/secpolicy/builder/Makefile.am (original)
+++ axis/axis2/c/core/trunk/neethi/src/secpolicy/builder/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -32,7 +32,7 @@ librp_builder_la_SOURCES = algorithmsuit
 librp_builder_la_LIBADD  = $(top_builddir)/../axiom/src/om/libaxis2_axiom.la \
                                $(top_builddir)/../util/src/libaxutil.la
 
-INCLUDES = -I$(top_srcdir)/include \
-                       -I $(top_srcdir)/../include \
-                       -I $(top_srcdir)/../util/include \
-            -I $(top_srcdir)/../axiom/include
+librp_builder_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                       -I 
$(top_srcdir)/../include \
+                                                       -I 
$(top_srcdir)/../util/include \
+                                                       -I 
$(top_srcdir)/../axiom/include

Modified: axis/axis2/c/core/trunk/neethi/src/secpolicy/model/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/neethi/src/secpolicy/model/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/neethi/src/secpolicy/model/Makefile.am (original)
+++ axis/axis2/c/core/trunk/neethi/src/secpolicy/model/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -25,10 +25,10 @@ librp_model_la_SOURCES = algorithmsuite.
                                                        trust10.c 
issued_token.c saml_token.c token.c
 
 
-librp_model_la_LIBADD  = ../../../../util/src/libaxutil.la
+librp_model_la_LIBADD  = $(top_builddir)/../util/src/libaxutil.la
 
 
-INCLUDES = -I$(top_srcdir)/include \
-                       -I $(top_srcdir)/../include \
-                       -I $(top_srcdir)/../util/include \
-               -I $(top_srcdir)/../axiom/include
+librp_model_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                 -I $(top_srcdir)/../include \
+                                                 -I 
$(top_srcdir)/../util/include \
+                                                 -I 
$(top_srcdir)/../axiom/include

Modified: axis/axis2/c/core/trunk/samples/client/amqp/echo/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/client/amqp/echo/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/client/amqp/echo/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/client/amqp/echo/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -12,38 +12,38 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-prgbindir = $(prefix)/samples/bin/amqp
-
-prgbin_PROGRAMS = echo_blocking \
-                                 echo_non_blocking \
-                                 echo_blocking_addr \
-                                 echo_blocking_dual \
-                                 echo_non_blocking_dual \
-                                 echo_blocking_soap11
-
-
-echo_blocking_SOURCES = echo_blocking.c echo_util.c
-echo_non_blocking_SOURCES = echo_non_blocking.c echo_util.c
-echo_blocking_addr_SOURCES = echo_blocking_addr.c echo_util.c
-echo_blocking_dual_SOURCES = echo_blocking_dual.c echo_util.c
-echo_non_blocking_dual_SOURCES = echo_non_blocking_dual.c echo_util.c
-echo_blocking_soap11_SOURCES = echo_blocking_soap11.c echo_util.c
-
-LINK_FLAGS = $(LDFLAGS) \
-             -L$(AXIS2C_HOME)/lib \
-                        -laxutil \
-             -laxis2_axiom \
-             -laxis2_engine \
-             -laxis2_parser \
-             $(GUTHTHILA_LIBS)
-
-echo_blocking_LDADD = $(LINK_FLAGS)
-echo_non_blocking_LDADD = $(LINK_FLAGS)
-echo_blocking_addr_LDADD = $(LINK_FLAGS)
-echo_blocking_dual_LDADD = $(LINK_FLAGS)
-echo_non_blocking_dual_LDADD = $(LINK_FLAGS)
-echo_blocking_soap11_LDADD = $(LINK_FLAGS)
-
-INCLUDES = @AXIS2INC@
-
-EXTRA_DIST=echo_util.h
+prgbindir = $(prefix)/samples/bin/amqp
+
+prgbin_PROGRAMS = echo_blocking \
+                                 echo_non_blocking \
+                                 echo_blocking_addr \
+                                 echo_blocking_dual \
+                                 echo_non_blocking_dual \
+                                 echo_blocking_soap11
+
+
+echo_blocking_SOURCES = echo_blocking.c echo_util.c
+echo_non_blocking_SOURCES = echo_non_blocking.c echo_util.c
+echo_blocking_addr_SOURCES = echo_blocking_addr.c echo_util.c
+echo_blocking_dual_SOURCES = echo_blocking_dual.c echo_util.c
+echo_non_blocking_dual_SOURCES = echo_non_blocking_dual.c echo_util.c
+echo_blocking_soap11_SOURCES = echo_blocking_soap11.c echo_util.c
+
+LINK_FLAGS = $(LDFLAGS) \
+             -L$(AXIS2C_HOME)/lib \
+                        -laxutil \
+             -laxis2_axiom \
+             -laxis2_engine \
+             -laxis2_parser \
+             $(GUTHTHILA_LIBS)
+
+echo_blocking_LDADD = $(LINK_FLAGS)
+echo_non_blocking_LDADD = $(LINK_FLAGS)
+echo_blocking_addr_LDADD = $(LINK_FLAGS)
+echo_blocking_dual_LDADD = $(LINK_FLAGS)
+echo_non_blocking_dual_LDADD = $(LINK_FLAGS)
+echo_blocking_soap11_LDADD = $(LINK_FLAGS)
+
+AM_CPPFLAGS = @AXIS2INC@
+
+EXTRA_DIST=echo_util.h

Modified: axis/axis2/c/core/trunk/samples/client/amqp/mtom/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/client/amqp/mtom/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/client/amqp/mtom/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/client/amqp/mtom/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -12,20 +12,20 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-SUBDIRS = resources
-
-prgbindir = $(prefix)/samples/bin/amqp
-
-prgbin_PROGRAMS = mtom
-
-mtom_SOURCES = mtom_client.c
-
-mtom_LDADD = $(LDFLAGS) \
-             -L$(AXIS2C_HOME)/lib \
-                    -laxutil \
-             -laxis2_axiom \
-             -laxis2_engine \
-             -laxis2_parser \
-             $(GUTHTHILA_LIBS)
-
-INCLUDES = @AXIS2INC@
+SUBDIRS = resources
+
+prgbindir = $(prefix)/samples/bin/amqp
+
+prgbin_PROGRAMS = mtom
+
+mtom_SOURCES = mtom_client.c
+
+mtom_LDADD = $(LDFLAGS) \
+             -L$(AXIS2C_HOME)/lib \
+                    -laxutil \
+             -laxis2_axiom \
+             -laxis2_engine \
+             -laxis2_parser \
+             $(GUTHTHILA_LIBS)
+
+mtom_CPPFLAGS = @AXIS2INC@

Modified: axis/axis2/c/core/trunk/samples/client/amqp/notify/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/client/amqp/notify/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/client/amqp/notify/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/client/amqp/notify/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -12,17 +12,17 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-prgbindir = $(prefix)/samples/bin/amqp
-
-prgbin_PROGRAMS = notify
-
-notify_SOURCES = notify_client.c
-
-notify_LDADD =  -L$(AXIS2C_HOME)/lib \
-                               -laxutil \
-                -laxis2_axiom \
-                -laxis2_engine \
-                -laxis2_parser \
-                $(GUTHTHILA_LIBS)
-
-INCLUDES = @AXIS2INC@
+prgbindir = $(prefix)/samples/bin/amqp
+
+prgbin_PROGRAMS = notify
+
+notify_SOURCES = notify_client.c
+
+notify_LDADD =  -L$(AXIS2C_HOME)/lib \
+                               -laxutil \
+                -laxis2_axiom \
+                -laxis2_engine \
+                -laxis2_parser \
+                $(GUTHTHILA_LIBS)
+
+notify_CPPFLAGS = @AXIS2INC@

Modified: axis/axis2/c/core/trunk/samples/client/echo/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/client/echo/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/client/echo/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/client/echo/Makefile.am Fri Jan 17 18:56:10 
2020
@@ -26,6 +26,6 @@ echo_LDADD   = $(LDFLAGS) \
                     -laxis2_http_receiver \
                     $(GUTHTHILA_LIBS)
 
-INCLUDES = @AXIS2INC@
+echo_CPPFLAGS = @AXIS2INC@
 
 EXTRA_DIST=README.txt echo.mk

Modified: axis/axis2/c/core/trunk/samples/client/google/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/client/google/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/client/google/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/client/google/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -26,6 +26,6 @@ google_LDADD   =    $(LDFLAGS) \
                     -laxis2_http_receiver \
                     $(GUTHTHILA_LIBS)
 
-INCLUDES = @AXIS2INC@
+google_CPPFLAGS = @AXIS2INC@
 
 EXTRA_DIST=README.txt google.mk

Modified: axis/axis2/c/core/trunk/samples/client/math/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/client/math/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/client/math/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/client/math/Makefile.am Fri Jan 17 18:56:10 
2020
@@ -28,6 +28,6 @@ math_LDADD   =  \
                     -laxis2_http_receiver \
                     $(GUTHTHILA_LIBS)
 
-INCLUDES = @AXIS2INC@
+math_CPPFLAGS = @AXIS2INC@
 
 EXTRA_DIST=math.mk

Modified: axis/axis2/c/core/trunk/samples/client/mtom/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/client/mtom/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/client/mtom/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/client/mtom/Makefile.am Fri Jan 17 18:56:10 
2020
@@ -28,6 +28,6 @@ mtom_LDADD   = $(LDFLAGS) \
                     -laxis2_http_receiver \
                     $(GUTHTHILA_LIBS)
 
-INCLUDES = @AXIS2INC@
+mtom_CPPFLAGS = @AXIS2INC@
 
 EXTRA_DIST=mtom.mk

Modified: axis/axis2/c/core/trunk/samples/client/mtom_callback/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/client/mtom_callback/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/client/mtom_callback/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/client/mtom_callback/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -27,6 +27,6 @@ mtom_callback_LDADD   = $(LDFLAGS) \
                     -laxis2_http_receiver \
                     $(GUTHTHILA_LIBS)
 
-INCLUDES = @AXIS2INC@
+mtom_callback_CPPFLAGS = @AXIS2INC@
 
 EXTRA_DIST=mtom_callback.mk

Modified: axis/axis2/c/core/trunk/samples/client/notify/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/client/notify/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/client/notify/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/client/notify/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -26,6 +26,6 @@ notify_LDADD   =  \
                     -laxis2_http_receiver \
                     $(GUTHTHILA_LIBS)
 
-INCLUDES = @AXIS2INC@
+notify_CPPFLAGS = @AXIS2INC@
 
 EXTRA_DIST=notify.mk

Modified: axis/axis2/c/core/trunk/samples/client/ntlm/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/client/ntlm/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/client/ntlm/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/client/ntlm/Makefile.am Fri Jan 17 18:56:10 
2020
@@ -31,5 +31,5 @@ LINK_FLAGS   = $(LDFLAGS) \
 
 ntlm_post_with_check_LDADD   = $(LINK_FLAGS)
 ntlm_post_LDADD   = $(LINK_FLAGS)
-INCLUDES = @AXIS2INC@
+AM_CPPFLAGS = @AXIS2INC@
 EXTRA_DIST=ntlm_util.h README ntlm.mk

Modified: axis/axis2/c/core/trunk/samples/client/session/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/client/session/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/client/session/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/client/session/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -26,6 +26,6 @@ session_LDADD   = $(LDFLAGS) \
                     -laxis2_http_receiver \
                     $(GUTHTHILA_LIBS)
 
-INCLUDES = @AXIS2INC@
+session_CPPFLAGS = @AXIS2INC@
 
 EXTRA_DIST=README.txt session.mk

Modified: axis/axis2/c/core/trunk/samples/client/version/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/client/version/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/client/version/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/client/version/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -28,5 +28,5 @@ version_LDADD   =  \
                     -laxis2_http_receiver \
                     $(GUTHTHILA_LIBS)
 
-INCLUDES = @AXIS2INC@
+version_CPPFLAGS = @AXIS2INC@
 

Modified: axis/axis2/c/core/trunk/samples/client/yahoo/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/client/yahoo/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/client/yahoo/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/client/yahoo/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -26,6 +26,6 @@ yahoosearch_LDADD   =    $(LDFLAGS) \
                     -laxis2_http_receiver \
                     $(GUTHTHILA_LIBS)
 
-INCLUDES = @AXIS2INC@
+yahoosearch_CPPFLAGS = @AXIS2INC@
 
 EXTRA_DIST=yahoo.mk

Modified: 
axis/axis2/c/core/trunk/samples/codegen/client/calc_xml_inout/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/codegen/client/calc_xml_inout/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/codegen/client/calc_xml_inout/Makefile.am 
(original)
+++ axis/axis2/c/core/trunk/samples/codegen/client/calc_xml_inout/Makefile.am 
Fri Jan 17 18:56:10 2020
@@ -32,6 +32,6 @@ Calculator_LDADD   = $(LDFLAGS) \
                     -laxis2_http_receiver \
                     $(GUTHTHILA_LIBS)
 
-INCLUDES = -I$(AXIS2C_HOME)/include \
-                       @UTILINC@ \
-                       @AXIOMINC@
+Calculator_CPPFLAGS = -I$(AXIS2C_HOME)/include \
+                                         @UTILINC@ \
+                                         @AXIOMINC@

Modified: axis/axis2/c/core/trunk/samples/codegen/client/calculator/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/codegen/client/calculator/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/codegen/client/calculator/Makefile.am 
(original)
+++ axis/axis2/c/core/trunk/samples/codegen/client/calculator/Makefile.am Fri 
Jan 17 18:56:10 2020
@@ -34,6 +34,6 @@ Calculator_LDADD   = $(LDFLAGS) \
                     -laxis2_http_receiver \
                     $(GUTHTHILA_LIBS)
 
-INCLUDES = -I$(AXIS2C_HOME)/include \
-                       @UTILINC@ \
-                       @AXIOMINC@
+Calculator_CPPFLAGS = -I$(AXIS2C_HOME)/include \
+                                         @UTILINC@ \
+                                         @AXIOMINC@

Modified: 
axis/axis2/c/core/trunk/samples/codegen/client/interop_doc1/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/codegen/client/interop_doc1/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/codegen/client/interop_doc1/Makefile.am 
(original)
+++ axis/axis2/c/core/trunk/samples/codegen/client/interop_doc1/Makefile.am Fri 
Jan 17 18:56:10 2020
@@ -63,6 +63,6 @@ test_echo_struct_array_LDADD   =  \
                     -laxis2_http_receiver \
                     $(GUTHTHILA_LIBS)
 
-INCLUDES = -I$(AXIS2C_HOME)/include \
-            @UTILINC@ \
-            @AXIOMINC@
+test_echo_struct_array_CPPFLAGS = -I$(AXIS2C_HOME)/include \
+                                                                 @UTILINC@ \
+                                                                 @AXIOMINC@

Modified: 
axis/axis2/c/core/trunk/samples/codegen/client/interop_doc2/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/codegen/client/interop_doc2/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/codegen/client/interop_doc2/Makefile.am 
(original)
+++ axis/axis2/c/core/trunk/samples/codegen/client/interop_doc2/Makefile.am Fri 
Jan 17 18:56:10 2020
@@ -51,6 +51,6 @@ test_echo_string_array_LDADD = \
             -laxis2_http_receiver \
            $(GUTHTHILA_LIBS)
 
-INCLUDES = -I$(AXIS2C_HOME)/include \
-               @UTILINC@ \
-               @AXIOMINC@
+AM_CPPFLAGS = -I$(AXIS2C_HOME)/include \
+                         @UTILINC@ \
+                         @AXIOMINC@

Modified: 
axis/axis2/c/core/trunk/samples/codegen/server/calc_xml_inout/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/codegen/server/calc_xml_inout/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/codegen/server/calc_xml_inout/Makefile.am 
(original)
+++ axis/axis2/c/core/trunk/samples/codegen/server/calc_xml_inout/Makefile.am 
Fri Jan 17 18:56:10 2020
@@ -23,6 +23,6 @@ libCalculator_la_SOURCES =  \
        axis2_Calculator_svc_skeleton.c
 
 libCalculator_la_LIBADD  =
-INCLUDES = -I$(AXIS2C_HOME)/include \
-                       @UTILINC@ \
-                       @AXIOMINC@
+libCalculator_la_CPPFLAGS = -I$(AXIS2C_HOME)/include \
+                                                       @UTILINC@ \
+                                                       @AXIOMINC@

Modified: axis/axis2/c/core/trunk/samples/codegen/server/calculator/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/codegen/server/calculator/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/codegen/server/calculator/Makefile.am 
(original)
+++ axis/axis2/c/core/trunk/samples/codegen/server/calculator/Makefile.am Fri 
Jan 17 18:56:10 2020
@@ -24,6 +24,6 @@ axis2_addRequest.c     axis2_Calculator_
 axis2_addResponse20.c  axis2_div.c                      axis2_mul.c            
axis2_sub.c \
 axis2_addResponse.c    axis2_divRequest.c               axis2_mulRequest.c     
axis2_subRequest.c 
 libCalculator_la_LIBADD  =
-INCLUDES = -I$(AXIS2C_HOME)/include \
-                       @UTILINC@ \
-                       @AXIOMINC@
+libCalculator_la_CPPFLAGS = -I$(AXIS2C_HOME)/include \
+                                                       @UTILINC@ \
+                                                       @AXIOMINC@

Modified: 
axis/axis2/c/core/trunk/samples/codegen/server/interop_doc1/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/codegen/server/interop_doc1/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/codegen/server/interop_doc1/Makefile.am 
(original)
+++ axis/axis2/c/core/trunk/samples/codegen/server/interop_doc1/Makefile.am Fri 
Jan 17 18:56:10 2020
@@ -32,6 +32,6 @@ axis2_echoFloatArrayResponse.c  axis2_ec
 axis2_echoFloat.c               axis2_echoStringResponse.c
 
 libInteropTestPortTypeDocService_la_LIBADD  =
-INCLUDES = -I$(AXIS2C_HOME)/include \
-                       @UTILINC@ \
-                       @AXIOMINC@
+libInteropTestPortTypeDocService_la_CPPFLAGS = -I$(AXIS2C_HOME)/include \
+                                                                               
           @UTILINC@ \
+                                                                               
           @AXIOMINC@

Modified: 
axis/axis2/c/core/trunk/samples/codegen/server/interop_doc2/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/codegen/server/interop_doc2/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/codegen/server/interop_doc2/Makefile.am 
(original)
+++ axis/axis2/c/core/trunk/samples/codegen/server/interop_doc2/Makefile.am Fri 
Jan 17 18:56:10 2020
@@ -25,6 +25,6 @@ axis2_echoStringArrayResponse.c  axis2_e
 axis2_echoString.c               axis2_echoVoid.c            
axis2_WSDLInteropTestDocLitService_svc_skeleton.c
 
 libWSDLInteropTestDocLitService_la_LIBADD  =
-INCLUDES = -I$(AXIS2C_HOME)/include \
-                       @UTILINC@ \
-                       @AXIOMINC@
+libWSDLInteropTestDocLitService_la_CPPFLAGS = -I$(AXIS2C_HOME)/include \
+                                                                               
          @UTILINC@ \
+                                                                               
          @AXIOMINC@

Modified: axis/axis2/c/core/trunk/samples/mtom_caching_callback/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/mtom_caching_callback/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/mtom_caching_callback/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/mtom_caching_callback/Makefile.am Fri Jan 
17 18:56:10 2020
@@ -19,6 +19,6 @@ libmtom_caching_callback_la_LIBADD  = $(
                                                                
-L$(AXIS2C_HOME)/lib \
                                                                -laxutil
 
-INCLUDES = -I ../../util/include \
-                       -I ../../axiom/include \
-               @AXIS2INC@
+libmtom_caching_callback_la_CPPFLAGS = -I ../../util/include \
+                                                                          -I 
../../axiom/include \
+                                                                          
@AXIS2INC@

Modified: axis/axis2/c/core/trunk/samples/mtom_sending_callback/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/mtom_sending_callback/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/mtom_sending_callback/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/mtom_sending_callback/Makefile.am Fri Jan 
17 18:56:10 2020
@@ -19,7 +19,7 @@ libmtom_sending_callback_la_LIBADD  = $(
                                                                
-L$(AXIS2C_HOME)/lib \
                                                                -laxutil 
 
-INCLUDES = -I ../../util/include \
-                       -I ../../axiom/include \
-                       -I /usr/include/mysql \
-               @AXIS2INC@
+libmtom_sending_callback_la_CPPFLAGS = -I ../../util/include \
+                                                                          -I 
../../axiom/include \
+                                                                          -I 
/usr/include/mysql \
+                                                                          
@AXIS2INC@

Modified: axis/axis2/c/core/trunk/samples/server/Calculator/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/server/Calculator/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/server/Calculator/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/server/Calculator/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -20,4 +20,4 @@ noinst_HEADERS = calc.h
 SUBDIRS =
 libCalculator_la_SOURCES = calc.c calc_skeleton.c
 libCalculator_la_LIBADD  =
-INCLUDES = @AXIS2INC@
+libCalculator_la_CPPFLAGS = @AXIS2INC@

Modified: axis/axis2/c/core/trunk/samples/server/echo/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/server/echo/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/server/echo/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/server/echo/Makefile.am Fri Jan 17 18:56:10 
2020
@@ -20,4 +20,4 @@ noinst_HEADERS = echo.h
 SUBDIRS =
 libecho_la_SOURCES = echo.c echo_skeleton.c
 libecho_la_LIBADD  =
-INCLUDES = @AXIS2INC@
+libecho_la_CPPFLAGS = @AXIS2INC@

Modified: axis/axis2/c/core/trunk/samples/server/math/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/server/math/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/server/math/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/server/math/Makefile.am Fri Jan 17 18:56:10 
2020
@@ -20,4 +20,4 @@ noinst_HEADERS = math.h
 SUBDIRS =
 libmath_la_SOURCES = math.c math_skeleton.c
 libmath_la_LIBADD  =
-INCLUDES = @AXIS2INC@
+libmath_la_CPPFLAGS = @AXIS2INC@

Modified: axis/axis2/c/core/trunk/samples/server/mtom/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/server/mtom/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/server/mtom/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/server/mtom/Makefile.am Fri Jan 17 18:56:10 
2020
@@ -20,4 +20,4 @@ noinst_HEADERS = mtom.h
 SUBDIRS =
 libmtom_la_SOURCES = mtom.c mtom_skeleton.c
 libmtom_la_LIBADD  =
-INCLUDES = @AXIS2INC@
+libmtom_la_CPPFLAGS = @AXIS2INC@

Modified: axis/axis2/c/core/trunk/samples/server/mtom_callback/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/server/mtom_callback/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/server/mtom_callback/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/server/mtom_callback/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -20,4 +20,4 @@ noinst_HEADERS = mtom_callback.h
 SUBDIRS =
 libmtom_callback_la_SOURCES = mtom_callback.c mtom_skeleton.c
 libmtom_callback_la_LIBADD  =
-INCLUDES = @AXIS2INC@
+libmtom_callback_la_CPPFLAGS = @AXIS2INC@

Modified: axis/axis2/c/core/trunk/samples/server/notify/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/server/notify/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/server/notify/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/server/notify/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -20,4 +20,4 @@ noinst_HEADERS = notify.h
 SUBDIRS =
 libnotify_la_SOURCES = notify.c notify_skeleton.c
 libnotify_la_LIBADD  =
-INCLUDES = @AXIS2INC@
+libnotify_la_CPPFLAGS = @AXIS2INC@

Modified: axis/axis2/c/core/trunk/samples/server/session/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/server/session/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/server/session/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/server/session/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -20,4 +20,4 @@ noinst_HEADERS = session.h
 SUBDIRS =
 libsession_la_SOURCES = session.c session_skeleton.c
 libsession_la_LIBADD  =
-INCLUDES = @AXIS2INC@
+libsession_la_CPPFLAGS = @AXIS2INC@

Modified: axis/axis2/c/core/trunk/samples/server/sg_math/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/server/sg_math/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/server/sg_math/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/server/sg_math/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -22,4 +22,4 @@ libadd_la_SOURCES = add.c add_skeleton.c
 libsub_la_SOURCES = sub.c sub_skeleton.c
 libmul_la_SOURCES = mul.c mul_skeleton.c
 libdiv_la_SOURCES = div.c div_skeleton.c
-INCLUDES = @AXIS2INC@
+AM_CPPFLAGS = @AXIS2INC@

Modified: axis/axis2/c/core/trunk/samples/server/version/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/server/version/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/server/version/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/server/version/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -19,6 +19,6 @@ noinst_HEADERS = version.h
 SUBDIRS =
 libversion_la_SOURCES = version.c version_skel.c
 libversion_la_LIBADD  =
-INCLUDES = @AXIS2INC@
+libversion_la_CPPFLAGS = @AXIS2INC@
 EXTRA_DIST = services.xml version.h
 

Modified: axis/axis2/c/core/trunk/samples/user_guide/clients/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/user_guide/clients/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/user_guide/clients/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/user_guide/clients/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -44,7 +44,7 @@ echo_non_blocking_dual_LDADD = $(LINK_FL
 echo_blocking_soap11_LDADD = $(LINK_FLAGS)
 echo_blocking_auth_LDADD = $(LINK_FLAGS)
 
-INCLUDES = @AXIS2INC@
+AM_CPPFLAGS = @AXIS2INC@
 
 EXTRA_DIST=echo_util.h echo_blocking_addr.mk echo_blocking.mk 
echo_non_blocking_dual.mk  echo_rest.mk echo_blocking_dual.mk 
echo_blocking_soap11.mk echo_non_blocking.mk echo_blocking_auth.mk
 

Modified: axis/axis2/c/core/trunk/src/core/addr/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/addr/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/addr/Makefile.am (original)
+++ axis/axis2/c/core/trunk/src/core/addr/Makefile.am Fri Jan 17 18:56:10 2020
@@ -21,7 +21,7 @@ libaxis2_addr_la_SOURCES =    relates_to.c
                             msg_info_headers.c
 
 
-INCLUDES = -I$(top_srcdir)/include \
-            -I$(top_srcdir)/src/core/engine \
-            -I$(top_srcdir)/util/include \
-            -I$(top_srcdir)/axiom/include 
+libaxis2_addr_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                       
-I$(top_srcdir)/src/core/engine \
+                                                       
-I$(top_srcdir)/util/include \
+                                                       
-I$(top_srcdir)/axiom/include 

Modified: axis/axis2/c/core/trunk/src/core/clientapi/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/clientapi/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/clientapi/Makefile.am (original)
+++ axis/axis2/c/core/trunk/src/core/clientapi/Makefile.am Fri Jan 17 18:56:10 
2020
@@ -12,20 +12,20 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-noinst_LTLIBRARIES = libaxis2_clientapi.la
-libaxis2_clientapi_la_SOURCES = async_result.c \
-                                callback.c \
-                                listener_manager.c \
-                                callback_recv.c \
-                                stub.c \
-                               options.c \
-                               op_client.c \
-                               svc_client.c
-
-INCLUDES = -I$(top_srcdir)/include \
-            -I$(top_srcdir)/src/core/engine \
-            -I$(top_srcdir)/src/core/deployment \
-            -I$(top_srcdir)/util/include \
-           -I$(top_srcdir)/util/include/platforms \
-            -I$(top_srcdir)/axiom/include \
-                       -I$(top_srcdir)/neethi/include
+noinst_LTLIBRARIES = libaxis2_clientapi.la
+libaxis2_clientapi_la_SOURCES = async_result.c \
+                                                               callback.c \
+                                                               
listener_manager.c \
+                                                               callback_recv.c 
\
+                                                               stub.c \
+                                                               options.c \
+                                                               op_client.c \
+                                                               svc_client.c
+
+libaxis2_clientapi_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                                
-I$(top_srcdir)/src/core/engine \
+                                                                
-I$(top_srcdir)/src/core/deployment \
+                                                                
-I$(top_srcdir)/util/include \
+                                                                
-I$(top_srcdir)/util/include/platforms \
+                                                                
-I$(top_srcdir)/axiom/include \
+                                                                
-I$(top_srcdir)/neethi/include

Modified: axis/axis2/c/core/trunk/src/core/context/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/context/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/context/Makefile.am (original)
+++ axis/axis2/c/core/trunk/src/core/context/Makefile.am Fri Jan 17 18:56:10 
2020
@@ -21,7 +21,7 @@ libaxis2_context_la_SOURCES = ctx.c \
                             svc_grp_ctx.c \
                             conf_ctx.c
 
-INCLUDES = -I$(top_srcdir)/include \
-            -I$(top_srcdir)/src/core/engine \
-            -I$(top_srcdir)/util/include \
-            -I$(top_srcdir)/axiom/include
+libaxis2_context_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                          
-I$(top_srcdir)/src/core/engine \
+                                                          
-I$(top_srcdir)/util/include \
+                                                          
-I$(top_srcdir)/axiom/include

Modified: axis/axis2/c/core/trunk/src/core/deployment/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/deployment/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/deployment/Makefile.am (original)
+++ axis/axis2/c/core/trunk/src/core/deployment/Makefile.am Fri Jan 17 18:56:10 
2020
@@ -41,12 +41,12 @@ libaxis2_deployment_la_SOURCES =phases_i
                                 repos_listener.c \
                                 conf_init.c
 
-INCLUDES = -I$(top_srcdir)/include \
-            -I$(top_srcdir)/src/core/description \
-            -I$(top_srcdir)/src/core/engine \
-            -I$(top_srcdir)/src/core/phaseresolver \
-            -I$(top_srcdir)/src/core/deployment \
-            -I$(top_srcdir)/src/core/util \
-            -I$(top_srcdir)/axiom/include \
-            -I$(top_srcdir)/neethi/include \
-            -I$(top_srcdir)/util/include
+libaxis2_deployment_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                                 
-I$(top_srcdir)/src/core/description \
+                                                                 
-I$(top_srcdir)/src/core/engine \
+                                                                 
-I$(top_srcdir)/src/core/phaseresolver \
+                                                                 
-I$(top_srcdir)/src/core/deployment \
+                                                                 
-I$(top_srcdir)/src/core/util \
+                                                                 
-I$(top_srcdir)/axiom/include \
+                                                                 
-I$(top_srcdir)/neethi/include \
+                                                                 
-I$(top_srcdir)/util/include

Modified: axis/axis2/c/core/trunk/src/core/description/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/description/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/description/Makefile.am (original)
+++ axis/axis2/c/core/trunk/src/core/description/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -30,9 +30,9 @@ libaxis2_description_la_SOURCES =desc.c
 
 libaxis2_description_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES = -I$(top_srcdir)/include \
-            -I$(top_srcdir)/src/core/engine \
-            -I$(top_srcdir)/util/include \
-            -I$(top_srcdir)/axiom/include \
-            -I$(top_srcdir)/neethi/include
+libaxis2_description_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                                  
-I$(top_srcdir)/src/core/engine \
+                                                                  
-I$(top_srcdir)/util/include \
+                                                                  
-I$(top_srcdir)/axiom/include \
+                                                                  
-I$(top_srcdir)/neethi/include
 

Modified: axis/axis2/c/core/trunk/src/core/engine/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/engine/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/engine/Makefile.am (original)
+++ axis/axis2/c/core/trunk/src/core/engine/Makefile.am Fri Jan 17 18:56:10 2020
@@ -14,48 +14,49 @@
 # limitations under the License.
 lib_LTLIBRARIES=libaxis2_engine.la
 
-libaxis2_engine_la_SOURCES= ../transport/transport_receiver.c handler.c \
-                               conf.c \
-                               phase.c \
-                               disp_checker.c \
-                               addr_disp.c \
-                                rest_disp.c \
-                               req_uri_disp.c \
-                               disp.c \
-                               soap_action_disp.c \
-                               soap_body_disp.c \
-                               ctx_handler.c \
-                               engine.c
+libaxis2_engine_la_SOURCES= 
$(top_srcdir)/src/core/transport/transport_receiver.c \
+                                                       handler.c \
+                                                       conf.c \
+                                                       phase.c \
+                                                       disp_checker.c \
+                                                       addr_disp.c \
+                                                       rest_disp.c \
+                                                       req_uri_disp.c \
+                                                       disp.c \
+                                                       soap_action_disp.c \
+                                                       soap_body_disp.c \
+                                                       ctx_handler.c \
+                                                       engine.c
 
 libaxis2_engine_la_LDFLAGS = -version-info $(VERSION_NO)
 
 
libaxis2_engine_la_LIBADD=$(top_builddir)/src/core/description/libaxis2_description.la
 \
-                          
$(top_builddir)/src/core/receivers/libaxis2_receivers.la \
-                         
$(top_builddir)/src/core/deployment/libaxis2_deployment.la \
-                                       
$(top_builddir)/src/core/context/libaxis2_context.la \
-                                       
$(top_builddir)/src/core/addr/libaxis2_addr.la \
-                                       
$(top_builddir)/src/core/clientapi/libaxis2_clientapi.la \
-                                       
$(top_builddir)/src/core/phaseresolver/libaxis2_phaseresolver.la \
-                                       
$(top_builddir)/src/core/util/libaxis2_core_utils.la \
-                                       $(top_builddir)/util/src/libaxutil.la \
-                                       $(top_builddir)/neethi/src/libneethi.la 
\
-                                       
$(top_builddir)/axiom/src/om/libaxis2_axiom.la 
+                                                 
$(top_builddir)/src/core/receivers/libaxis2_receivers.la \
+                                                 
$(top_builddir)/src/core/deployment/libaxis2_deployment.la \
+                                                 
$(top_builddir)/src/core/context/libaxis2_context.la \
+                                                 
$(top_builddir)/src/core/addr/libaxis2_addr.la \
+                                                 
$(top_builddir)/src/core/clientapi/libaxis2_clientapi.la \
+                                                 
$(top_builddir)/src/core/phaseresolver/libaxis2_phaseresolver.la \
+                                                 
$(top_builddir)/src/core/util/libaxis2_core_utils.la \
+                                                 
$(top_builddir)/util/src/libaxutil.la \
+                                                 
$(top_builddir)/neethi/src/libneethi.la \
+                                                 
$(top_builddir)/axiom/src/om/libaxis2_axiom.la 
 
libaxis2_engine_la_LIBADD+=$(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la
 \
-                          
$(top_builddir)/src/core/transport/http/util/libaxis2_http_util.la
+                                                  
$(top_builddir)/src/core/transport/http/util/libaxis2_http_util.la
 
 
-INCLUDES =  -I$(top_srcdir)/include \
-            -I$(top_srcdir)/src/wsdl \
-            -I$(top_srcdir)/src/core/description \
-            -I$(top_srcdir)/src/core/engine \
-            -I$(top_srcdir)/src/core/phaseresolver \
-            -I$(top_srcdir)/src/core/deployment \
-            -I$(top_srcdir)/src/core/context \
-            -I$(top_srcdir)/src/core/util \
-            -I$(top_srcdir)/src/core/clientapi \
-            -I$(top_srcdir)/util/include \
-            -I$(top_srcdir)/neethi/include \
-            -I$(top_srcdir)/axiom/include
+libaxis2_engine_la_CPPFLAGS =  -I$(top_srcdir)/include \
+                                                          
-I$(top_srcdir)/src/wsdl \
+                                                          
-I$(top_srcdir)/src/core/description \
+                                                          
-I$(top_srcdir)/src/core/engine \
+                                                          
-I$(top_srcdir)/src/core/phaseresolver \
+                                                          
-I$(top_srcdir)/src/core/deployment \
+                                                          
-I$(top_srcdir)/src/core/context \
+                                                          
-I$(top_srcdir)/src/core/util \
+                                                          
-I$(top_srcdir)/src/core/clientapi \
+                                                          
-I$(top_srcdir)/util/include \
+                                                          
-I$(top_srcdir)/neethi/include \
+                                                          
-I$(top_srcdir)/axiom/include
 
 EXTRA_DIST=axis2_disp_checker.h
 

Modified: axis/axis2/c/core/trunk/src/core/phaseresolver/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/phaseresolver/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/phaseresolver/Makefile.am (original)
+++ axis/axis2/c/core/trunk/src/core/phaseresolver/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -17,7 +17,7 @@ noinst_LTLIBRARIES = libaxis2_phaseresol
 libaxis2_phaseresolver_la_SOURCES =    phase_holder.c \
                                        phase_resolver.c
 
-INCLUDES = -I$(top_srcdir)/include \
-            -I$(top_srcdir)/src/core/engine \
-            -I$(top_srcdir)/axiom/include      \
-            -I$(top_srcdir)/util/include
+libaxis2_phaseresolver_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                                        
-I$(top_srcdir)/src/core/engine \
+                                                                        
-I$(top_srcdir)/axiom/include  \
+                                                                        
-I$(top_srcdir)/util/include

Modified: axis/axis2/c/core/trunk/src/core/receivers/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/receivers/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/receivers/Makefile.am (original)
+++ axis/axis2/c/core/trunk/src/core/receivers/Makefile.am Fri Jan 17 18:56:10 
2020
@@ -18,8 +18,8 @@ libaxis2_receivers_la_SOURCES = msg_recv
                                 raw_xml_in_out_msg_recv.c \
                                 svr_callback.c
 
-INCLUDES = -I$(top_srcdir)/include \
-            -I$(top_srcdir)/src/core/engine \
-            -I$(top_srcdir)/src/core/util \
-            -I$(top_srcdir)/util/include       \
-            -I$(top_srcdir)/axiom/include
+libaxis2_receivers_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                                
-I$(top_srcdir)/src/core/engine \
+                                                                
-I$(top_srcdir)/src/core/util \
+                                                                
-I$(top_srcdir)/util/include   \
+                                                                
-I$(top_srcdir)/axiom/include

Modified: axis/axis2/c/core/trunk/src/core/transport/amqp/receiver/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/transport/amqp/receiver/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/transport/amqp/receiver/Makefile.am 
(original)
+++ axis/axis2/c/core/trunk/src/core/transport/amqp/receiver/Makefile.am Fri 
Jan 17 18:56:10 2020
@@ -12,28 +12,28 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-SUBDIRS = qpid_receiver
-
-lib_LTLIBRARIES = libaxis2_amqp_receiver.la
-
-libaxis2_amqp_receiver_la_SOURCES = axis2_amqp_receiver.c
-
-libaxis2_amqp_receiver_la_LIBADD = $(top_builddir)/util/src/libaxutil.la \
-                                                                  
$(top_builddir)/src/core/transport/amqp/util/libaxis2_amqp_util.la \
-                                                                  
$(top_builddir)/src/core/transport/amqp/receiver/qpid_receiver/libaxis2_qpid_receiver.la
-
-libaxis2_amqp_receiver_la_LDFLAGS = -version-info $(VERSION_NO)
-
-INCLUDES = -I$(top_srcdir)/include \
-              -I$(top_srcdir)/src/core/transport/amqp/util \
-              -I$(top_srcdir)/src/core/transport/amqp/receiver \
-              -I$(top_srcdir)/src/core/transport/amqp/sender/qpid_sender \
-              -I$(top_srcdir)/src/core/transport/amqp/receiver/qpid_receiver \
-           -I$(top_srcdir)/src/core/description \
-           -I$(top_srcdir)/src/core/context \
-           -I$(top_srcdir)/src/core/phaseresolver \
-           -I$(top_srcdir)/src/core/engine \
-           -I$(top_srcdir)/src/core/deployment \
-           -I$(top_srcdir)/util/include \
-           -I$(top_srcdir)/axiom/include
-
+SUBDIRS = qpid_receiver
+
+lib_LTLIBRARIES = libaxis2_amqp_receiver.la
+
+libaxis2_amqp_receiver_la_SOURCES = axis2_amqp_receiver.c
+
+libaxis2_amqp_receiver_la_LIBADD = $(top_builddir)/util/src/libaxutil.la \
+                                                                  
$(top_builddir)/src/core/transport/amqp/util/libaxis2_amqp_util.la \
+                                                                  
$(top_builddir)/src/core/transport/amqp/receiver/qpid_receiver/libaxis2_qpid_receiver.la
+
+libaxis2_amqp_receiver_la_LDFLAGS = -version-info $(VERSION_NO)
+
+libaxis2_amqp_receiver_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                                        
-I$(top_srcdir)/src/core/transport/amqp/util \
+                                                                        
-I$(top_srcdir)/src/core/transport/amqp/receiver \
+                                                                        
-I$(top_srcdir)/src/core/transport/amqp/sender/qpid_sender \
+                                                                        
-I$(top_srcdir)/src/core/transport/amqp/receiver/qpid_receiver \
+                                                                        
-I$(top_srcdir)/src/core/description \
+                                                                        
-I$(top_srcdir)/src/core/context \
+                                                                        
-I$(top_srcdir)/src/core/phaseresolver \
+                                                                        
-I$(top_srcdir)/src/core/engine \
+                                                                        
-I$(top_srcdir)/src/core/deployment \
+                                                                        
-I$(top_srcdir)/util/include \
+                                                                        
-I$(top_srcdir)/axiom/include
+

Modified: 
axis/axis2/c/core/trunk/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- 
axis/axis2/c/core/trunk/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am
 (original)
+++ 
axis/axis2/c/core/trunk/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am
 Fri Jan 17 18:56:10 2020
@@ -12,32 +12,32 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-SUBDIRS = request_processor
-
-lib_LTLIBRARIES = libaxis2_qpid_receiver.la
-
-libaxis2_qpid_receiver_la_SOURCES = axis2_qpid_receiver.cpp \
-                                                                       
axis2_qpid_receiver_interface.cpp \
-                                                                       
axis2_qpid_receiver_listener.cpp
-
-libaxis2_qpid_receiver_la_LIBADD = $(top_builddir)/util/src/libaxutil.la \
-                                                                  
$(QPID_HOME)/lib/libqpidclient.la \
-                                                                  
$(top_builddir)/src/core/transport/amqp/util/libaxis2_amqp_util.la \
-                                                                  
$(top_builddir)/src/core/transport/amqp/receiver/qpid_receiver/request_processor/libaxis2_amqp_request_processor.la
-
-libaxis2_qpid_receiver_la_LDFLAGS = g++ -version-info $(VERSION_NO)
-
-INCLUDES = -I$(top_srcdir)/include \
-              -I$(top_srcdir)/src/core/transport/amqp/receiver/qpid_receiver \
-              
-I$(top_srcdir)/src/core/transport/amqp/receiver/qpid_receiver/request_processor
 \
-              -I$(top_srcdir)/src/core/transport/amqp/util \
-              -I$(top_srcdir)/src/core/transport/amqp/sender/qpid_sender \
-           -I$(top_srcdir)/src/core/description \
-           -I$(top_srcdir)/src/core/context \
-           -I$(top_srcdir)/src/core/phaseresolver \
-           -I$(top_srcdir)/src/core/engine \
-           -I$(top_srcdir)/src/core/deployment \
-           -I$(top_srcdir)/util/include \
-           -I$(top_srcdir)/axiom/include \
-                  -I$(QPID_HOME)/include
-
+SUBDIRS = request_processor
+
+lib_LTLIBRARIES = libaxis2_qpid_receiver.la
+
+libaxis2_qpid_receiver_la_SOURCES = axis2_qpid_receiver.cpp \
+                                                                       
axis2_qpid_receiver_interface.cpp \
+                                                                       
axis2_qpid_receiver_listener.cpp
+
+libaxis2_qpid_receiver_la_LIBADD = $(top_builddir)/util/src/libaxutil.la \
+                                                                  
$(QPID_HOME)/lib/libqpidclient.la \
+                                                                  
$(top_builddir)/src/core/transport/amqp/util/libaxis2_amqp_util.la \
+                                                                  
$(top_builddir)/src/core/transport/amqp/receiver/qpid_receiver/request_processor/libaxis2_amqp_request_processor.la
+
+libaxis2_qpid_receiver_la_LDFLAGS = g++ -version-info $(VERSION_NO)
+
+libaxis2_qpid_receiver_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                                        
-I$(top_srcdir)/src/core/transport/amqp/receiver/qpid_receiver \
+                                                                        
-I$(top_srcdir)/src/core/transport/amqp/receiver/qpid_receiver/request_processor
 \
+                                                                        
-I$(top_srcdir)/src/core/transport/amqp/util \
+                                                                        
-I$(top_srcdir)/src/core/transport/amqp/sender/qpid_sender \
+                                                                        
-I$(top_srcdir)/src/core/description \
+                                                                        
-I$(top_srcdir)/src/core/context \
+                                                                        
-I$(top_srcdir)/src/core/phaseresolver \
+                                                                        
-I$(top_srcdir)/src/core/engine \
+                                                                        
-I$(top_srcdir)/src/core/deployment \
+                                                                        
-I$(top_srcdir)/util/include \
+                                                                        
-I$(top_srcdir)/axiom/include \
+                                                                        
-I$(QPID_HOME)/include
+

Modified: 
axis/axis2/c/core/trunk/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- 
axis/axis2/c/core/trunk/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am
 (original)
+++ 
axis/axis2/c/core/trunk/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am
 Fri Jan 17 18:56:10 2020
@@ -12,23 +12,23 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-lib_LTLIBRARIES = libaxis2_amqp_request_processor.la
-
-libaxis2_amqp_request_processor_la_SOURCES = axis2_amqp_request_processor.c
-
-libaxis2_amqp_request_processor_la_LIBADD = 
$(top_builddir)/util/src/libaxutil.la \
-                                                                               
        $(top_builddir)/src/core/transport/amqp/util/libaxis2_amqp_util.la
-
-libaxis2_amqp_request_processor_la_LDFLAGS = -version-info $(VERSION_NO)
-
-INCLUDES = -I$(top_srcdir)/include \
-              
-I$(top_srcdir)/src/core/transport/amqp/receiver/qpid_receiver/request_processor
 \
-              -I$(top_srcdir)/src/core/transport/amqp/util \
-           -I$(top_srcdir)/src/core/description \
-           -I$(top_srcdir)/src/core/context \
-           -I$(top_srcdir)/src/core/phaseresolver \
-           -I$(top_srcdir)/src/core/engine \
-           -I$(top_srcdir)/src/core/deployment \
-           -I$(top_srcdir)/util/include \
-           -I$(top_srcdir)/axiom/include
-
+lib_LTLIBRARIES = libaxis2_amqp_request_processor.la
+
+libaxis2_amqp_request_processor_la_SOURCES = axis2_amqp_request_processor.c
+
+libaxis2_amqp_request_processor_la_LIBADD = 
$(top_builddir)/util/src/libaxutil.la \
+                                                                               
        $(top_builddir)/src/core/transport/amqp/util/libaxis2_amqp_util.la
+
+libaxis2_amqp_request_processor_la_LDFLAGS = -version-info $(VERSION_NO)
+
+libaxis2_amqp_request_processor_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                                               
          
-I$(top_srcdir)/src/core/transport/amqp/receiver/qpid_receiver/request_processor
 \
+                                                                               
          -I$(top_srcdir)/src/core/transport/amqp/util \
+                                                                               
          -I$(top_srcdir)/src/core/description \
+                                                                               
          -I$(top_srcdir)/src/core/context \
+                                                                               
          -I$(top_srcdir)/src/core/phaseresolver \
+                                                                               
          -I$(top_srcdir)/src/core/engine \
+                                                                               
          -I$(top_srcdir)/src/core/deployment \
+                                                                               
          -I$(top_srcdir)/util/include \
+                                                                               
          -I$(top_srcdir)/axiom/include
+

Modified: axis/axis2/c/core/trunk/src/core/transport/amqp/sender/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/transport/amqp/sender/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/transport/amqp/sender/Makefile.am 
(original)
+++ axis/axis2/c/core/trunk/src/core/transport/amqp/sender/Makefile.am Fri Jan 
17 18:56:10 2020
@@ -12,29 +12,29 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-SUBDIRS = qpid_sender
-
-lib_LTLIBRARIES = libaxis2_amqp_sender.la
-
-libaxis2_amqp_sender_la_SOURCES = axis2_amqp_sender.c
-
-libaxis2_amqp_sender_la_LIBADD = $(top_builddir)/util/src/libaxutil.la \
-                                                                
$(top_builddir)/src/core/transport/amqp/util/libaxis2_amqp_util.la \
-                                                                
$(top_builddir)/src/core/transport/amqp/sender/qpid_sender/libaxis2_qpid_sender.la
-
-libaxis2_amqp_sender_la_LDFLAGS = -version-info $(VERSION_NO)
-
-INCLUDES = -I$(top_srcdir)/include \
-              -I$(top_srcdir)/src/core/transport/amqp/util \
-              -I$(top_srcdir)/src/core/transport/amqp/receiver \
-              -I$(top_srcdir)/src/core/transport/amqp/receiver/qpid_receiver \
-              -I$(top_srcdir)/src/core/transport/amqp/sender \
-              -I$(top_srcdir)/src/core/transport/amqp/sender/qpid_sender \
-           -I$(top_srcdir)/src/core/description \
-           -I$(top_srcdir)/src/core/context \
-           -I$(top_srcdir)/src/core/phaseresolver \
-           -I$(top_srcdir)/src/core/engine \
-           -I$(top_srcdir)/src/core/deployment \
-           -I$(top_srcdir)/util/include \
-           -I$(top_srcdir)/axiom/include
-
+SUBDIRS = qpid_sender
+
+lib_LTLIBRARIES = libaxis2_amqp_sender.la
+
+libaxis2_amqp_sender_la_SOURCES = axis2_amqp_sender.c
+
+libaxis2_amqp_sender_la_LIBADD = $(top_builddir)/util/src/libaxutil.la \
+                                                                
$(top_builddir)/src/core/transport/amqp/util/libaxis2_amqp_util.la \
+                                                                
$(top_builddir)/src/core/transport/amqp/sender/qpid_sender/libaxis2_qpid_sender.la
+
+libaxis2_amqp_sender_la_LDFLAGS = -version-info $(VERSION_NO)
+
+libaxis2_amqp_sender_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                                  
-I$(top_srcdir)/src/core/transport/amqp/util \
+                                                                  
-I$(top_srcdir)/src/core/transport/amqp/receiver \
+                                                                  
-I$(top_srcdir)/src/core/transport/amqp/receiver/qpid_receiver \
+                                                                  
-I$(top_srcdir)/src/core/transport/amqp/sender \
+                                                                  
-I$(top_srcdir)/src/core/transport/amqp/sender/qpid_sender \
+                                                                  
-I$(top_srcdir)/src/core/description \
+                                                                  
-I$(top_srcdir)/src/core/context \
+                                                                  
-I$(top_srcdir)/src/core/phaseresolver \
+                                                                  
-I$(top_srcdir)/src/core/engine \
+                                                                  
-I$(top_srcdir)/src/core/deployment \
+                                                                  
-I$(top_srcdir)/util/include \
+                                                                  
-I$(top_srcdir)/axiom/include
+

Modified: 
axis/axis2/c/core/trunk/src/core/transport/amqp/sender/qpid_sender/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/transport/amqp/sender/qpid_sender/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- 
axis/axis2/c/core/trunk/src/core/transport/amqp/sender/qpid_sender/Makefile.am 
(original)
+++ 
axis/axis2/c/core/trunk/src/core/transport/amqp/sender/qpid_sender/Makefile.am 
Fri Jan 17 18:56:10 2020
@@ -12,26 +12,26 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-lib_LTLIBRARIES = libaxis2_qpid_sender.la
-
-libaxis2_qpid_sender_la_SOURCES = axis2_qpid_sender.cpp \
-                                                                 
axis2_qpid_sender_interface.cpp
-
-libaxis2_qpid_sender_la_LIBADD = $(top_builddir)/util/src/libaxutil.la \
-                                                                
$(top_builddir)/src/core/transport/amqp/util/libaxis2_amqp_util.la \
-                                                                
$(QPID_HOME)/lib/libqpidclient.la
-
-libaxis2_qpid_sender_la_LDFLAGS = g++ -version-info $(VERSION_NO)
-
-INCLUDES = -I$(top_srcdir)/include \
-              -I$(top_srcdir)/src/core/transport/amqp/sender/qpid_sender \
-              -I$(top_srcdir)/src/core/transport/amqp/util \
-           -I$(top_srcdir)/src/core/description \
-           -I$(top_srcdir)/src/core/context \
-           -I$(top_srcdir)/src/core/phaseresolver \
-           -I$(top_srcdir)/src/core/engine \
-           -I$(top_srcdir)/src/core/deployment \
-           -I$(top_srcdir)/util/include \
-           -I$(top_srcdir)/axiom/include \
-                  -I$(QPID_HOME)/include
-
+lib_LTLIBRARIES = libaxis2_qpid_sender.la
+
+libaxis2_qpid_sender_la_SOURCES = axis2_qpid_sender.cpp \
+                                                                 
axis2_qpid_sender_interface.cpp
+
+libaxis2_qpid_sender_la_LIBADD = $(top_builddir)/util/src/libaxutil.la \
+                                                                
$(top_builddir)/src/core/transport/amqp/util/libaxis2_amqp_util.la \
+                                                                
$(QPID_HOME)/lib/libqpidclient.la
+
+libaxis2_qpid_sender_la_LDFLAGS = g++ -version-info $(VERSION_NO)
+
+libaxis2_qpid_sender_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                                  
-I$(top_srcdir)/src/core/transport/amqp/sender/qpid_sender \
+                                                                  
-I$(top_srcdir)/src/core/transport/amqp/util \
+                                                                  
-I$(top_srcdir)/src/core/description \
+                                                                  
-I$(top_srcdir)/src/core/context \
+                                                                  
-I$(top_srcdir)/src/core/phaseresolver \
+                                                                  
-I$(top_srcdir)/src/core/engine \
+                                                                  
-I$(top_srcdir)/src/core/deployment \
+                                                                  
-I$(top_srcdir)/util/include \
+                                                                  
-I$(top_srcdir)/axiom/include \
+                                                                  
-I$(QPID_HOME)/include
+

Modified: 
axis/axis2/c/core/trunk/src/core/transport/amqp/server/axis2_amqp_server/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/transport/amqp/server/axis2_amqp_server/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- 
axis/axis2/c/core/trunk/src/core/transport/amqp/server/axis2_amqp_server/Makefile.am
 (original)
+++ 
axis/axis2/c/core/trunk/src/core/transport/amqp/server/axis2_amqp_server/Makefile.am
 Fri Jan 17 18:56:10 2020
@@ -12,35 +12,33 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-prgbindir = $(bindir)
-
-prgbin_PROGRAMS = axis2_amqp_server
-
-AM_CFLAGS = -g 
-
-axis2_amqp_server_SOURCES = axis2_amqp_server.c
-
-axis2_amqp_server_LDADD = $(LDFLAGS) \
-                                         
$(top_builddir)/axiom/src/om/libaxis2_axiom.la \
-                                                 
$(top_builddir)/util/src/libaxutil.la \
-                                                 
$(top_builddir)/axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
-                                                 
$(top_builddir)/src/core/description/libaxis2_description.la \
-                                                 
$(top_builddir)/src/core/deployment/libaxis2_deployment.la \
-                                                 
$(top_builddir)/src/core/context/libaxis2_context.la \
-                                                 
$(top_builddir)/src/core/clientapi/libaxis2_clientapi.la \
-                                                 
$(top_builddir)/src/core/engine/libaxis2_engine.la \
-                                                 
$(top_builddir)/neethi/src/libneethi.la \
-                                                 
$(top_builddir)/src/core/transport/amqp/receiver/libaxis2_amqp_receiver.la \
-                                                 
$(top_builddir)/src/core/transport/amqp/util/libaxis2_amqp_util.la
-                    
-INCLUDES = -I$(top_srcdir)/include \
-           -I$(top_srcdir)/src/core/description \
-           -I$(top_srcdir)/src/core/context \
-           -I$(top_srcdir)/src/core/deploymenti \
-           -I$(top_srcdir)/src/core/phaseresolver \
-           -I$(top_srcdir)/src/core/engine \
-           -I$(top_srcdir)/src/core/transport/amqp/receiver \
-           -I$(top_srcdir)/src/core/transport/amqp/receiver/qpid_receiver \
-           -I$(top_srcdir)/src/core/transport/amqp/util \
-           -I$(top_srcdir)/util/include \
-           -I$(top_srcdir)/axiom/include
+prgbindir = $(bindir)
+
+prgbin_PROGRAMS = axis2_amqp_server
+
+axis2_amqp_server_SOURCES = axis2_amqp_server.c
+
+axis2_amqp_server_LDADD = $(LDFLAGS) \
+                                         
$(top_builddir)/axiom/src/om/libaxis2_axiom.la \
+                                                 
$(top_builddir)/util/src/libaxutil.la \
+                                                 
$(top_builddir)/axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
+                                                 
$(top_builddir)/src/core/description/libaxis2_description.la \
+                                                 
$(top_builddir)/src/core/deployment/libaxis2_deployment.la \
+                                                 
$(top_builddir)/src/core/context/libaxis2_context.la \
+                                                 
$(top_builddir)/src/core/clientapi/libaxis2_clientapi.la \
+                                                 
$(top_builddir)/src/core/engine/libaxis2_engine.la \
+                                                 
$(top_builddir)/neethi/src/libneethi.la \
+                                                 
$(top_builddir)/src/core/transport/amqp/receiver/libaxis2_amqp_receiver.la \
+                                                 
$(top_builddir)/src/core/transport/amqp/util/libaxis2_amqp_util.la
+                    
+axis2_amqp_server_CPPFLAGS = -I$(top_srcdir)/include \
+                                                        
-I$(top_srcdir)/src/core/description \
+                                                        
-I$(top_srcdir)/src/core/context \
+                                                        
-I$(top_srcdir)/src/core/deploymenti \
+                                                        
-I$(top_srcdir)/src/core/phaseresolver \
+                                                        
-I$(top_srcdir)/src/core/engine \
+                                                        
-I$(top_srcdir)/src/core/transport/amqp/receiver \
+                                                        
-I$(top_srcdir)/src/core/transport/amqp/receiver/qpid_receiver \
+                                                        
-I$(top_srcdir)/src/core/transport/amqp/util \
+                                                        
-I$(top_srcdir)/util/include \
+                                                        
-I$(top_srcdir)/axiom/include

Modified: axis/axis2/c/core/trunk/src/core/transport/amqp/util/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/transport/amqp/util/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/transport/amqp/util/Makefile.am (original)
+++ axis/axis2/c/core/trunk/src/core/transport/amqp/util/Makefile.am Fri Jan 17 
18:56:10 2020
@@ -20,13 +20,13 @@ libaxis2_amqp_util_la_LIBADD = $(top_bui
 
 libaxis2_amqp_util_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES = -I$(top_srcdir)/include \
-              -I$(top_srcdir)/src/core/transport/amqp/util \
-              -I$(top_srcdir)/src/core/transport/amqp/sender/qpid_sender \
-           -I$(top_srcdir)/src/core/description \
-           -I$(top_srcdir)/src/core/context \
-           -I$(top_srcdir)/src/core/engine \
-           -I$(top_srcdir)/src/core/deployment \
-           -I$(top_srcdir)/util/include \
-           -I$(top_srcdir)/axiom/include
+libaxis2_amqp_util_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                                
-I$(top_srcdir)/src/core/transport/amqp/util \
+                                                                
-I$(top_srcdir)/src/core/transport/amqp/sender/qpid_sender \
+                                                                
-I$(top_srcdir)/src/core/description \
+                                                                
-I$(top_srcdir)/src/core/context \
+                                                                
-I$(top_srcdir)/src/core/engine \
+                                                                
-I$(top_srcdir)/src/core/deployment \
+                                                                
-I$(top_srcdir)/util/include \
+                                                                
-I$(top_srcdir)/axiom/include
 

Modified: axis/axis2/c/core/trunk/src/core/transport/http/common/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/transport/http/common/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/transport/http/common/Makefile.am 
(original)
+++ axis/axis2/c/core/trunk/src/core/transport/http/common/Makefile.am Fri Jan 
17 18:56:10 2020
@@ -31,13 +31,13 @@ libaxis2_http_common_la_SOURCES = http_h
 
 libaxis2_http_common_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES = -I$(top_srcdir)/include \
-              -I$(top_srcdir)/src/core/transport\
-              -I$(top_srcdir)/src/core/transport/http \
-           -I$(top_srcdir)/src/core/description \
-           -I$(top_srcdir)/src/core/context \
-           -I$(top_srcdir)/src/core/phaseresolver \
-           -I$(top_srcdir)/src/core/engine \
-           -I$(top_srcdir)/src/core/deployment \
-           -I$(top_srcdir)/util/include \
-           -I$(top_srcdir)/axiom/include
+libaxis2_http_common_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                                  
-I$(top_srcdir)/src/core/transport\
+                                                                  
-I$(top_srcdir)/src/core/transport/http \
+                                                                  
-I$(top_srcdir)/src/core/description \
+                                                                  
-I$(top_srcdir)/src/core/context \
+                                                                  
-I$(top_srcdir)/src/core/phaseresolver \
+                                                                  
-I$(top_srcdir)/src/core/engine \
+                                                                  
-I$(top_srcdir)/src/core/deployment \
+                                                                  
-I$(top_srcdir)/util/include \
+                                                                  
-I$(top_srcdir)/axiom/include

Modified: axis/axis2/c/core/trunk/src/core/transport/http/receiver/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/transport/http/receiver/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/transport/http/receiver/Makefile.am 
(original)
+++ axis/axis2/c/core/trunk/src/core/transport/http/receiver/Makefile.am Fri 
Jan 17 18:56:10 2020
@@ -23,13 +23,13 @@ libaxis2_http_receiver_la_SOURCES = http
 
 libaxis2_http_receiver_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES = -I$(top_srcdir)/include \
-              -I$(top_srcdir)/src/core/transport\
-              -I$(top_srcdir)/src/core/transport/http \
-           -I$(top_srcdir)/src/core/description \
-           -I$(top_srcdir)/src/core/context \
-           -I$(top_srcdir)/src/core/phaseresolver \
-           -I$(top_srcdir)/src/core/engine \
-           -I$(top_srcdir)/src/core/deployment \
-           -I$(top_srcdir)/util/include \
-           -I$(top_srcdir)/axiom/include
+libaxis2_http_receiver_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                                        
-I$(top_srcdir)/src/core/transport\
+                                                                        
-I$(top_srcdir)/src/core/transport/http \
+                                                                        
-I$(top_srcdir)/src/core/description \
+                                                                        
-I$(top_srcdir)/src/core/context \
+                                                                        
-I$(top_srcdir)/src/core/phaseresolver \
+                                                                        
-I$(top_srcdir)/src/core/engine \
+                                                                        
-I$(top_srcdir)/src/core/deployment \
+                                                                        
-I$(top_srcdir)/util/include \
+                                                                        
-I$(top_srcdir)/axiom/include

Modified: axis/axis2/c/core/trunk/src/core/transport/http/sender/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/transport/http/sender/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/transport/http/sender/Makefile.am 
(original)
+++ axis/axis2/c/core/trunk/src/core/transport/http/sender/Makefile.am Fri Jan 
17 18:56:10 2020
@@ -57,22 +57,22 @@ libaxis2_http_sender_la_LIBADD = $(top_b
 
 libaxis2_http_sender_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES = -I$(top_srcdir)/include \
-              -I$(top_srcdir)/src/core/transport\
-           -I$(top_srcdir)/src/core/transport/http \
-           -I$(top_srcdir)/src/core/transport/http/sender/libcurl \
-           -I$(top_srcdir)/src/core/description \
-           -I$(top_srcdir)/src/core/context \
-           -I$(top_srcdir)/src/core/phaseresolver \
-           -I$(top_srcdir)/src/core/engine \
-           -I$(top_srcdir)/src/core/deployment \
-           -I$(top_srcdir)/util/include \
-           -I$(top_srcdir)/axiom/include \
-                  $(SSL_INC)
+libaxis2_http_sender_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                                  
-I$(top_srcdir)/src/core/transport\
+                                                                  
-I$(top_srcdir)/src/core/transport/http \
+                                                                  
-I$(top_srcdir)/src/core/transport/http/sender/libcurl \
+                                                                  
-I$(top_srcdir)/src/core/description \
+                                                                  
-I$(top_srcdir)/src/core/context \
+                                                                  
-I$(top_srcdir)/src/core/phaseresolver \
+                                                                  
-I$(top_srcdir)/src/core/engine \
+                                                                  
-I$(top_srcdir)/src/core/deployment \
+                                                                  
-I$(top_srcdir)/util/include \
+                                                                  
-I$(top_srcdir)/axiom/include \
+                                                                  $(SSL_INC)
 
 
 if AXIS2_JSON_ENABLED
 libaxis2_http_sender_la_SOURCES += axis2_json_writer.c
 libaxis2_http_sender_la_LIBADD += $(JSON_LIBS)
-INCLUDES += $(JSON_CFLAGS)
+libaxis2_http_sender_la_CPPFLAGS += $(JSON_CFLAGS)
 endif

Modified: 
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/default/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/default/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- 
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/default/Makefile.am 
(original)
+++ 
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/default/Makefile.am 
Fri Jan 17 18:56:10 2020
@@ -20,5 +20,5 @@ libaxis2_ntlm_la_SOURCES = ../ntlm.c \
 
 libaxis2_ntlm_la_LIBADD =  $(top_builddir)/util/src/libaxutil.la
 
-INCLUDES = -I$(top_srcdir)/include \
-            -I$(top_srcdir)/util/include
+libaxis2_ntlm_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                       
-I$(top_srcdir)/util/include

Modified: 
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/heimdal/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/heimdal/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- 
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/heimdal/Makefile.am 
(original)
+++ 
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/heimdal/Makefile.am 
Fri Jan 17 18:56:10 2020
@@ -24,6 +24,6 @@ libaxis2_ntlm_la_LIBADD = @NTLM_LDFLAGS@
 #libaxis2_ntlm_la_LDFLAGS = -version-info $(VERSION_NO)
 
 
-INCLUDES = -I$(top_srcdir)/include \
-            -I$(top_srcdir)/util/include \
-                       @NTLM_CFLAGS@
+libaxis2_ntlm_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                       
-I$(top_srcdir)/util/include \
+                                                       @NTLM_CFLAGS@

Modified: 
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/libntlm/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/libntlm/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- 
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/libntlm/Makefile.am 
(original)
+++ 
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/libntlm/Makefile.am 
Fri Jan 17 18:56:10 2020
@@ -24,6 +24,6 @@ libaxis2_ntlm_la_LIBADD = @NTLM_LDFLAGS@
 #libaxis2_ntlm_la_LDFLAGS = -version-info $(VERSION_NO)
 
 
-INCLUDES = -I$(top_srcdir)/include \
-            -I$(top_srcdir)/util/include \
-                       @NTLM_CFLAGS@
+libaxis2_ntlm_la_CPPFLAGS = -I$(top_srcdir)/include \
+                                                       
-I$(top_srcdir)/util/include \
+                                                       @NTLM_CFLAGS@

Modified: 
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/test/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/test/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- 
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/test/Makefile.am 
(original)
+++ 
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/test/Makefile.am 
Fri Jan 17 18:56:10 2020
@@ -16,14 +16,17 @@ TESTS =
 SUBDIRS = mock_server
 noinst_PROGRAMS = test_ntlm mock_client
 check_PROGRAMS = test_ntlm mock_client
-AM_CFLAGS = -g -O2
 test_ntlm_SOURCES = client.c
 mock_client_SOURCES = mock_client.c
 
 LINK_FLAGS   = 
$(top_builddir)/src/core/transport/http/sender/ntlm/$(NTLM_WRAPPER_DIR)/libaxis2_ntlm.la
 \
                                        $(top_builddir)/util/src/libaxutil.la
 
+PREPROCESSOR_FLAGS = -I$(top_srcdir)/include \
+                                        -I$(top_srcdir)/util/include
+
 test_ntlm_LDADD   =    $(LINK_FLAGS)
 mock_client_LDADD   =  $(LINK_FLAGS)
-INCLUDES = -I$(top_srcdir)/include \
-            -I$(top_srcdir)/util/include
+
+test_ntlm_CPPFLAGS   = $(PREPROCESSOR_FLAGS)
+mock_client_CPPFLAGS   =       $(PREPROCESSOR_FLAGS)

Modified: 
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/test/mock_server/Makefile.am
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/test/mock_server/Makefile.am?rev=1872931&r1=1872930&r2=1872931&view=diff
==============================================================================
--- 
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/test/mock_server/Makefile.am
 (original)
+++ 
axis/axis2/c/core/trunk/src/core/transport/http/sender/ntlm/test/mock_server/Makefile.am
 Fri Jan 17 18:56:10 2020
@@ -16,10 +16,9 @@ TESTS =
 noinst_PROGRAMS = mock_server
 check_PROGRAMS = mock_server
 SUBDIRS =
-AM_CFLAGS = -g -O2
 mock_server_SOURCES = mock_server.c
 
 mock_server_LDADD   = $(top_builddir)/util/src/libaxutil.la
 
-INCLUDES = -I$(top_srcdir)/include \
-            -I$(top_srcdir)/util/include
+mock_server_CPPFLAGS = -I$(top_srcdir)/include \
+                                          -I$(top_srcdir)/util/include


Reply via email to