Hi all,
Do we need to keep CPPFLAGS in Makefile.am files? If not, a patch to
remove them is attached. Please review and apply.
Thanks.
~sanjaya
--
http://sanjaya.8k.com
Index: test/unit/xml/om/Makefile.am
===================================================================
--- test/unit/xml/om/Makefile.am (revision 379400)
+++ test/unit/xml/om/Makefile.am (working copy)
@@ -1,14 +1,10 @@
TESTS = om_test
prglibdir=$(prefix)/lib/unit_test
prgbindir=$(prefix)/bin/unit_test
-noinst_HEADERS = om_node_test.h
+noinst_HEADERS = om_node_test.h $(top_builddir)/test/unit/xml/om/*.h
prglib_LTLIBRARIES = libtest_om.la
-AM_CPPFLAGS = $(CPPFLAGS)
libtest_om_la_SOURCES = om_test.c om_node_test.c
-
-noinst_HEADERS=$(top_builddir)/test/unit/xml/om/*.h
-
INCLUDES = -I$(top_builddir)/include \
-I${CUTEST_HOME}/include \
-I$(top_builddir)/modules/util \
Index: test/unit/core/deployment/Makefile.am
===================================================================
--- test/unit/core/deployment/Makefile.am (revision 379400)
+++ test/unit/core/deployment/Makefile.am (working copy)
@@ -2,7 +2,6 @@
prgbindir=$(prefix)/bin/unit_test
prglibdir=$(prefix)/lib/unit_test
prglib_LTLIBRARIES = libtest_deployment.la
-AM_CPPFLAGS = $(CPPFLAGS)
libtest_deployment_la_SOURCES = deployment_test.c \
test_phases_info.c \
test_dep_engine.c
Index: test/unit/core/phaseresolver/Makefile.am
===================================================================
--- test/unit/core/phaseresolver/Makefile.am (revision 379400)
+++ test/unit/core/phaseresolver/Makefile.am (working copy)
@@ -2,7 +2,6 @@
prgbindir=$(prefix)/bin/unit_test
prglibdir=$(prefix)/lib/unit_test
prglib_LTLIBRARIES = libtest_phaseresolver.la
-AM_CPPFLAGS = $(CPPFLAGS)
libtest_phaseresolver_la_SOURCES = phaseresolver_test.c \
test_resolver.c \
test_phase_holder.c
Index: test/unit/core/description/Makefile.am
===================================================================
--- test/unit/core/description/Makefile.am (revision 379400)
+++ test/unit/core/description/Makefile.am (working copy)
@@ -2,7 +2,6 @@
prgbindir=$(prefix)/bin/unit_test
prglibdir=$(prefix)/lib/unit_test
prglib_LTLIBRARIES = libtest_description.la
-AM_CPPFLAGS = $(CPPFLAGS)
libtest_description_la_SOURCES = description_test.c \
test_op.c \
test_svc.c \
Index: test/unit/core/context/Makefile.am
===================================================================
--- test/unit/core/context/Makefile.am (revision 379400)
+++ test/unit/core/context/Makefile.am (working copy)
@@ -2,7 +2,6 @@
prgbindir=$(prefix)/bin/unit_test
prglibdir=$(prefix)/lib/unit_test
prglib_LTLIBRARIES = libtest_context.la
-AM_CPPFLAGS = $(CPPFLAGS)
libtest_context_la_SOURCES = context_test.c
noinst_HEADERS=$(top_builddir)/test/unit/core/context/*.h
Index: test/unit/core/engine/Makefile.am
===================================================================
--- test/unit/core/engine/Makefile.am (revision 379400)
+++ test/unit/core/engine/Makefile.am (working copy)
@@ -2,7 +2,6 @@
prgbindir=$(prefix)/bin/unit_test
prglibdir=$(prefix)/lib/unit_test
prglib_LTLIBRARIES = libtest_engine.la
-AM_CPPFLAGS = $(CPPFLAGS)
libtest_engine_la_SOURCES = engine_test.c test_conf.c
noinst_HEADERS=$(top_builddir)/test/unit/core/engine/*.h
Index: test/unit/wsdl/Makefile.am
===================================================================
--- test/unit/wsdl/Makefile.am (revision 379400)
+++ test/unit/wsdl/Makefile.am (working copy)
@@ -2,7 +2,6 @@
prglibdir=$(prefix)/lib/unit_test
prgbindir=$(prefix)/bin/unit_test
prglib_LTLIBRARIES = libtest_wsdl.la
-AM_CPPFLAGS = $(CPPFLAGS)
libtest_wsdl_la_SOURCES = wsdl_test.c test_wsdl_component.c
Index: test/unit/Makefile.am
===================================================================
--- test/unit/Makefile.am (revision 379400)
+++ test/unit/Makefile.am (working copy)
@@ -2,7 +2,6 @@
prgbindir=$(prefix)/bin/unit_test
prgbin_PROGRAMS = main_unit_test_suite
SUBDIRS = util core xml wsdl
-AM_CPPFLAGS = $(CPPFLAGS)
main_unit_test_suite_SOURCES = main.c
main_unit_test_suite_LDADD = \
Index: test/xml/soap/Makefile.am
===================================================================
--- test/xml/soap/Makefile.am (revision 379400)
+++ test/xml/soap/Makefile.am (working copy)
@@ -3,7 +3,7 @@
prgbin_PROGRAMS = test_soap
check_PROGRAMS = test_soap
SUBDIRS =
-AM_CPPFLAGS = $(CPPFLAGS) -g -O2 -pthread
+AM_CFLAGS = -g -O2 -pthread
test_soap_SOURCES = test_soap.c
test_soap_LDADD = \
Index: test/xml/om/Makefile.am
===================================================================
--- test/xml/om/Makefile.am (revision 379400)
+++ test/xml/om/Makefile.am (working copy)
@@ -3,7 +3,7 @@
prgbin_PROGRAMS = test_om
check_PROGRAMS = test_om
SUBDIRS =
-AM_CPPFLAGS = $(CPPFLAGS) -g -O2 -pthread
+AM_CFLAGS = -g -O2 -pthread
test_om_SOURCES = test_om.c
test_om_LDADD = \
Index: test/core/description/Makefile.am
===================================================================
--- test/core/description/Makefile.am (revision 379400)
+++ test/core/description/Makefile.am (working copy)
@@ -2,7 +2,7 @@
prgbindir=$(prefix)/bin/system_test
prgbin_PROGRAMS = test_description
SUBDIRS =
-AM_CPPFLAGS = $(CPPFLAGS) -g -O2 -pthread
+AM_CFLAGS = -g -O2 -pthread
test_description_SOURCES = test_description.c
test_description_LDADD = -L$(AXIS2C_HOME)/lib \
Index: test/core/context/Makefile.am
===================================================================
--- test/core/context/Makefile.am (revision 379400)
+++ test/core/context/Makefile.am (working copy)
@@ -1,7 +1,7 @@
TESTS = test_context
check_PROGRAMS = test_context
SUBDIRS =
-AM_CPPFLAGS = $(CPPFLAGS) -g -pthread
+AM_CFLAGS = -g -pthread
test_context_SOURCES = test_context.c
Index: test/core/engine/Makefile.am
===================================================================
--- test/core/engine/Makefile.am (revision 379400)
+++ test/core/engine/Makefile.am (working copy)
@@ -3,7 +3,7 @@
check_PROGRAMS = test_engine
prgbin_PROGRAMS = test_engine
SUBDIRS =
-AM_CPPFLAGS = $(CPPFLAGS) -g -pthread
+AM_CFLAGS = -g -pthread
test_engine_SOURCES = test_engine.c
Index: test/core/clientapi/Makefile.am
===================================================================
--- test/core/clientapi/Makefile.am (revision 379400)
+++ test/core/clientapi/Makefile.am (working copy)
@@ -3,7 +3,7 @@
prgbin_PROGRAMS = test_client test_clientapi
check_PROGRAMS = test_client test_clientapi
SUBDIRS =
-AM_CPPFLAGS = $(CPPFLAGS) -g -pthread
+AM_CFLAGS = -g -pthread
test_client_SOURCES = test_client.c
test_clientapi_SOURCES = test_clientapi.c
Index: test/core/addr/Makefile.am
===================================================================
--- test/core/addr/Makefile.am (revision 379400)
+++ test/core/addr/Makefile.am (working copy)
@@ -1,7 +1,7 @@
TESTS = test_addr
check_PROGRAMS = test_addr
SUBDIRS =
-AM_CPPFLAGS = $(CPPFLAGS) -g -pthread
+AM_CFLAGS = -g -pthread
test_addr_SOURCES = test_addr.c
Index: test/core/transport/http/Makefile.am
===================================================================
--- test/core/transport/http/Makefile.am (revision 379400)
+++ test/core/transport/http/Makefile.am (working copy)
@@ -3,7 +3,7 @@
check_PROGRAMS = test_http_transport
prgbin_PROGRAMS = test_http_transport
SUBDIRS =
-AM_CPPFLAGS = $(CPPFLAGS) -g -pthread
+AM_CFLAGS = -g -pthread
test_http_transport_SOURCES = test_http_transport.c
test_http_transport_LDADD = $(LDFLAGS) \
Index: test/util/Makefile.am
===================================================================
--- test/util/Makefile.am (revision 379400)
+++ test/util/Makefile.am (working copy)
@@ -5,7 +5,6 @@
test_thread.h
check_PROGRAMS = test_util test_thread
SUBDIRS =
-AM_CPPFLAGS = $(CPPFLAGS)
test_util_SOURCES = test_util.c test_log.c
test_thread_SOURCES = test_thread.c
Index: modules/xml/soap/Makefile.am
===================================================================
--- modules/xml/soap/Makefile.am (revision 379400)
+++ modules/xml/soap/Makefile.am (working copy)
@@ -1,5 +1,4 @@
lib_LTLIBRARIES = libaxis2_soap.la
-AM_CPPFLAGS = $(CPPFLAGS)
libaxis2_soap_la_SOURCES = soap_fault.c \
soap_fault_code.c \
soap_fault_detail.c \
Index: modules/xml/om/Makefile.am
===================================================================
--- modules/xml/om/Makefile.am (revision 379400)
+++ modules/xml/om/Makefile.am (working copy)
@@ -1,6 +1,5 @@
TESTS =
lib_LTLIBRARIES = libaxis2_om.la
-AM_CPPFLAGS = $(CPPFLAGS)
libaxis2_om_la_SOURCES = om_attribute.c \
om_document.c \
om_node.c \
Index: modules/xml/parser/guththila/impl/src/Makefile.am
===================================================================
--- modules/xml/parser/guththila/impl/src/Makefile.am (revision 379400)
+++ modules/xml/parser/guththila/impl/src/Makefile.am (working copy)
@@ -1,6 +1,5 @@
TESTS =
lib_LTLIBRARIES = libguththila.la
-AM_CPPFLAGS = $(CPPFLAGS)
libguththila_la_SOURCES = guththila_token.c \
guththila_xml_pull_parser.c \
guththila_buffer.c \
Index: modules/xml/parser/guththila/Makefile.am
===================================================================
--- modules/xml/parser/guththila/Makefile.am (revision 379400)
+++ modules/xml/parser/guththila/Makefile.am (working copy)
@@ -1,7 +1,6 @@
TESTS =
lib_LTLIBRARIES = libaxis2_guththila.la
SUBDIRS = impl
-AM_CPPFLAGS = $(CPPFLAGS)
libaxis2_guththila_la_SOURCES = guththila_xml_writer_wrapper.c \
guththila_xml_reader_wrapper.c
Index: modules/xml/parser/libxml2/Makefile.am
===================================================================
--- modules/xml/parser/libxml2/Makefile.am (revision 379400)
+++ modules/xml/parser/libxml2/Makefile.am (working copy)
@@ -1,6 +1,5 @@
TESTS =
lib_LTLIBRARIES = libaxis2_libxml2.la libaxis2_parser.la
-AM_CPPFLAGS = $(CPPFLAGS)
libaxis2_libxml2_la_SOURCES = libxml2_reader_wrapper.c \
libxml2_writer_wrapper.c
Index: modules/platforms/unix/Makefile.am
===================================================================
--- modules/platforms/unix/Makefile.am (revision 379400)
+++ modules/platforms/unix/Makefile.am (working copy)
@@ -6,7 +6,6 @@
axis2_uuid_gen_unix.h \
axis2_thread_unix.h
-AM_CPPFLAGS = $(CPPFLAGS)
libaxis2_unix_la_SOURCES = uuid_gen_unix.c\
thread_unix.c
Index: modules/core/engine/Makefile.am
===================================================================
--- modules/core/engine/Makefile.am (revision 379400)
+++ modules/core/engine/Makefile.am (working copy)
@@ -1,6 +1,5 @@
TESTS =
lib_LTLIBRARIES = libaxis2_engine.la
-AM_CPPFLAGS = $(CPPFLAGS)
noinst_HEADERS = axis2_engine.h \
axis2_event.h
Index: modules/core/transport/http/sender/Makefile.am
===================================================================
--- modules/core/transport/http/sender/Makefile.am (revision 379400)
+++ modules/core/transport/http/sender/Makefile.am (working copy)
@@ -1,6 +1,5 @@
TESTS =
lib_LTLIBRARIES = libaxis2_http_sender.la
-AM_CPPFLAGS = $(CPPFLAGS)
libaxis2_http_sender_la_SOURCES = http_transport_sender.c\
soap_over_http_sender.c\
http_client.c
Index: modules/core/transport/http/receiver/Makefile.am
===================================================================
--- modules/core/transport/http/receiver/Makefile.am (revision 379400)
+++ modules/core/transport/http/receiver/Makefile.am (working copy)
@@ -1,6 +1,6 @@
TESTS =
lib_LTLIBRARIES = libaxis2_http_receiver.la
-AM_CPPFLAGS = $(CPPFLAGS) -laxis2_unix
+libaxis2_http_receiver_LDADD= -laxis2_unix
libaxis2_http_receiver_la_SOURCES = simple_http_svr_conn.c\
http_response_writer.c\
http_svr_thread.c\
Index: modules/core/transport/http/server/simple_axis2_server/Makefile.am
===================================================================
--- modules/core/transport/http/server/simple_axis2_server/Makefile.am
(revision 379400)
+++ modules/core/transport/http/server/simple_axis2_server/Makefile.am
(working copy)
@@ -2,7 +2,7 @@
prgbindir=$(prefix)/bin/
prgbin_PROGRAMS = axis2_http_server
SUBDIRS =
-AM_CPPFLAGS = $(CPPFLAGS) -g -pthread
+AM_CFLAGS = -g -pthread
axis2_http_server_SOURCES = http_server_main.c
axis2_http_server_LDADD = $(LDFLAGS) \
Index: modules/mod_addr/Makefile.am
===================================================================
--- modules/mod_addr/Makefile.am (revision 379400)
+++ modules/mod_addr/Makefile.am (working copy)
@@ -3,7 +3,6 @@
prglib_LTLIBRARIES = libaxis2_mod_addr.la
prglib_DATA= module.xml
EXTRA_DIST = module.xml
-AM_CPPFLAGS = $(CPPFLAGS)
libaxis2_mod_addr_la_SOURCES = addr_in_handler.c \
addr_out_handler.c \
mod_addr.c
Index: modules/wsdl/Makefile.am
===================================================================
--- modules/wsdl/Makefile.am (revision 379400)
+++ modules/wsdl/Makefile.am (working copy)
@@ -1,6 +1,5 @@
TESTS =
lib_LTLIBRARIES = libaxis2_wsdl.la
-AM_CPPFLAGS = $(CPPFLAGS)
libaxis2_wsdl_la_SOURCES = wsdl_op.c \
wsdl_svc.c \
wsdl_component.c \
Index: modules/util/Makefile.am
===================================================================
--- modules/util/Makefile.am (revision 379400)
+++ modules/util/Makefile.am (working copy)
@@ -12,7 +12,6 @@
axis2_linked_list.h
-AM_CPPFLAGS = $(CPPFLAGS)
libaxis2_util_la_SOURCES = hash.c \
allocator.c \
env.c \
