File singular-am_cppflags.diff of Package singular

Overview Repositories Revisions Requests Users Attributes Meta

File singular-am_cppflags.diff of Package singular (Revision a2434fc071129b8f8dda39ed11ee29ca)

Currently displaying revision a2434fc071129b8f8dda39ed11ee29ca , Show latest

parent f5003202cd7b3ecb45644eb4564edd5bd717f34c ()
commit 17041fe7763717f1772361ebc8d58cd84c98c460
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Mon Jan 2 11:58:22 2012 +0100

build: modernize INCLUDES to AM_CPPFLAGS

autoreconf says:
Makefile.am:29: "INCLUDES" is the old name for "AM_CPPFLAGS" (or "*_CPPFLAGS")

Subtitute appropriately.
---
 Singular/Makefile.am           |   32 ++++++++++++++++----------------
 findexec/Makefile.am           |    6 +++---
 kernel/Makefile.am             |   14 +++++++-------
 libpolys/coeffs/Makefile.am    |   14 +++++++-------
 libpolys/misc/Makefile.am      |    6 +++---
 libpolys/polys/Makefile.am     |   24 ++++++++++++------------
 libpolys/reporter/Makefile.am  |    6 +++---
 libpolys/resources/Makefile.am |    6 +++---
 libpolys/tests/Makefile.am     |   30 +++++++++++++++---------------
 numeric/Makefile.am            |    6 +++---
 omalloc/Makefile.am            |   20 ++++++++++----------
 xalloc/Makefile.am             |    6 +++---
 12 files changed, 85 insertions(+), 85 deletions(-)

Index: Source/Singular/Makefile.am
===================================================================
--- Source.orig/Singular/Makefile.am
+++ Source/Singular/Makefile.am
@@ -13,7 +13,7 @@ NODEBUGDEFS = -DNDEBUG -DOM_NDEBUG
 
 CXXTEMPLFLAGS = --no-exceptions ## -fno-implicit-templates
 
-INCLUDES = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/numeric -I${top_builddir}/numeric -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) $(FACTORY_CFLAGS) $(NTL_CFLAGS)
+AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/numeric -I${top_builddir}/numeric -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) $(FACTORY_CFLAGS) $(NTL_CFLAGS)
 
 ########################### libSingular* #########################
 
@@ -31,8 +31,8 @@ libSingular_g_la_CXXFLAGS = -g -Wextra -
 # -fdiagnostics-show-option 
 
 
-libSingular_la_CPPFLAGS   = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DLIBSINGULAR
-libSingular_g_la_CPPFLAGS = -DHAVE_CONFIG_H -DLIBSINGULAR
+libSingular_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DLIBSINGULAR
+libSingular_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DLIBSINGULAR
 
 SOURCES =    Minor.cc\
    MinorInterface.cc\
@@ -187,25 +187,25 @@ noinst_PROGRAMS = gentable2 gentable1 fe
 gentable2_SOURCES = gentable2.cc grammar.h tok.h table.h
 gentable2_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
 gentable2_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
-gentable2_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
+gentable2_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
 
 
 gentable1_SOURCES = gentable.cc grammar.h tok.h table.h
 gentable1_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
 gentable1_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
-gentable1_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
+gentable1_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
 
 feOpt_SOURCES = feOptGen.cc feOptGen.h
 feOpt_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
-feOpt_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
+feOpt_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
 
 feOptES_SOURCES = feOptGen.cc feOptGen.h
 feOptES_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
-feOptES_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DESINGULAR 
+feOptES_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DESINGULAR
 
 feOptTS_SOURCES = feOptGen.cc feOptGen.h
 feOptTS_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
-feOptTS_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DTSINGULAR
+feOptTS_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DTSINGULAR
 
 ########################### Singular* #########################
 
@@ -226,8 +226,8 @@ Singularg_SOURCES = tesths.cc
 Singular_LDADD = libSingular.la -lnumeric -lkernel -lpolys $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
 Singularg_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
 
-Singular_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
-Singularg_CPPFLAGS = -DHAVE_CONFIG_H 
+Singular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
+Singularg_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
 
 Singular_LDFLAGS = -static
 Singularg_LDFLAGS = -static
@@ -248,8 +248,8 @@ nodist_Singulardg_SOURCES =  libSingular
 Singulard_LDADD = libSingular.la -lnumeric -lkernel -lpolys $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
 Singulardg_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
 
-Singulard_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
-Singulardg_CPPFLAGS = -DHAVE_CONFIG_H 
+Singulard_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
+Singulardg_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
 
 
 #########################################################
@@ -289,8 +289,8 @@ test_s_g_SOURCES = test.cc
 test_s_r_LDADD = libSingular.la -lnumeric -lkernel -lpolys $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
 test_s_g_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
 
-test_s_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
-test_s_g_CPPFLAGS = -DHAVE_CONFIG_H 
+test_s_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
+test_s_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
 
 test_s_r_LDFLAGS = -static
 test_s_g_LDFLAGS = -static
@@ -310,8 +310,8 @@ test_d_g_SOURCES = test.cc
 test_d_r_LDADD = libSingular.la -lnumeric -lkernel -lpolys $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
 test_d_g_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
 
-test_d_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
-test_d_g_CPPFLAGS = -DHAVE_CONFIG_H 
+test_d_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
+test_d_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
 
 #########################################################
 
Index: Source/findexec/Makefile.am
===================================================================
--- Source.orig/findexec/Makefile.am
+++ Source/findexec/Makefile.am
@@ -13,10 +13,10 @@ libfindexec_la_CXXFLAGS   = -O3 -fomit-f
 libfindexec_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
 # -fdiagnostics-show-option 
 
-libfindexec_la_CPPFLAGS   = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
-libfindexec_g_la_CPPFLAGS = -DHAVE_CONFIG_H 
+libfindexec_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
+libfindexec_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
 
-INCLUDES = -I${top_srcdir} -I${top_builddir} 
+AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir}
 
 SOURCES  = omFindExec.c
 libfindexec_la_SOURCES   = $(SOURCES)
Index: Source/kernel/Makefile.am
===================================================================
--- Source.orig/kernel/Makefile.am
+++ Source/kernel/Makefile.am
@@ -25,10 +25,10 @@ libkernel_la_CXXFLAGS   = -O3 -fomit-fra
 libkernel_g_la_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)
 # -fdiagnostics-show-option 
 
-libkernel_la_CPPFLAGS   = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
-libkernel_g_la_CPPFLAGS = -DHAVE_CONFIG_H 
+libkernel_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
+libkernel_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
 
-INCLUDES = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) $(FACTORY_CFLAGS) $(NTL_CFLAGS)
+AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) $(FACTORY_CFLAGS) $(NTL_CFLAGS)
 
 SOURCES = polys.cc febase.cc feread.cc \
     hdegree.cc hilb.cc hutil.cc \
@@ -105,8 +105,8 @@ test_s_g_SOURCES = $(testsources)
 test_s_r_LDADD = -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
 test_s_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
 
-test_s_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
-test_s_g_CPPFLAGS = -DHAVE_CONFIG_H 
+test_s_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
+test_s_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
 
 test_s_r_LDFLAGS = -static
 test_s_g_LDFLAGS = -static
@@ -124,8 +124,8 @@ test_d_g_SOURCES = $(testsources)
 test_d_r_LDADD = -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
 test_d_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
 
-test_d_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
-test_d_g_CPPFLAGS = -DHAVE_CONFIG_H 
+test_d_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
+test_d_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
 
 
 
Index: Source/libpolys/coeffs/Makefile.am
===================================================================
--- Source.orig/libpolys/coeffs/Makefile.am
+++ Source/libpolys/coeffs/Makefile.am
@@ -11,8 +11,8 @@ libcoeffs_la_CXXFLAGS   = -O3 -fomit-fra
 libcoeffs_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
 # -fdiagnostics-show-option 
 
-libcoeffs_la_CPPFLAGS   = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
-libcoeffs_g_la_CPPFLAGS = -DHAVE_CONFIG_H
+libcoeffs_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
+libcoeffs_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
 
 
 # noinst_HEADERS= \
@@ -20,7 +20,7 @@ libcoeffs_g_la_CPPFLAGS = -DHAVE_CONFIG_
 #	rintegers.h rmodulo2m.h rmodulon.h shortfl.h \
 #	mpr_complex.h mpr_global.h
 
-INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} ${FACTORY_CFLAGS} ${GMP_CFLAGS} ${NTL_CFLAGS}
+AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} ${FACTORY_CFLAGS} ${GMP_CFLAGS} ${NTL_CFLAGS}
 
 SOURCES = \
 	numbers.cc rintegers.cc rmodulo2m.cc rmodulon.cc shortfl.cc \
@@ -84,11 +84,11 @@ test_d_g_CXXFLAGS = -g -Wextra -Wall -pe
 
 
 
-test_s_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
-test_s_g_CPPFLAGS = -DHAVE_CONFIG_H
+test_s_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
+test_s_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
 
-test_d_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
-test_d_g_CPPFLAGS = -DHAVE_CONFIG_H
+test_d_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
+test_d_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
 
 
 test_s_r_LDFLAGS = -static
Index: Source/libpolys/misc/Makefile.am
===================================================================
--- Source.orig/libpolys/misc/Makefile.am
+++ Source/libpolys/misc/Makefile.am
@@ -10,10 +10,10 @@ libmisc_la_CXXFLAGS   = -O3 -fomit-frame
 libmisc_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
 # -fdiagnostics-show-option 
 
-libmisc_la_CPPFLAGS   = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
-libmisc_g_la_CPPFLAGS = -DHAVE_CONFIG_H
+libmisc_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
+libmisc_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
 
-INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..
+AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..
 
 SOURCES  = intvec.cc int64vec.cc options.c
 libmisc_la_SOURCES   = $(SOURCES)
Index: Source/libpolys/polys/Makefile.am
===================================================================
--- Source.orig/libpolys/polys/Makefile.am
+++ Source/libpolys/polys/Makefile.am
@@ -9,7 +9,7 @@ NODEBUGDEFS = -DNDEBUG -DOM_NDEBUG
 AM_CFLAGS	= ${PIPE}
 AM_CXXFLAGS	= ${PIPE} ${CXXTEMPLFLAGS}
 
-INCLUDES	= -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${includedir} ${GMP_CFLAGS}
+AM_CPPFLAGS	= -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${includedir} ${GMP_CFLAGS}
 AM_LDFLAGS	= -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/resources -L${top_builddir}/../omalloc -L${builddir}
 
 if ENABLE_P_PROCS_STATIC
@@ -65,15 +65,15 @@ EXTRA_DIST = \
 
 P_PROCS_CPPFLAGS_COMMON = -DDYNAMIC_VERSION 
 
-p_Procs_FieldGeneral_la_CPPFLAGS = -Dp_Procs_FieldGeneral ${P_PROCS_CPPFLAGS_COMMON} ${NODEBUGDEFS}
-p_Procs_FieldIndep_la_CPPFLAGS = -Dp_Procs_FieldIndep ${P_PROCS_CPPFLAGS_COMMON} ${NODEBUGDEFS}
-p_Procs_FieldQ_la_CPPFLAGS = -Dp_Procs_FieldQ ${P_PROCS_CPPFLAGS_COMMON} ${NODEBUGDEFS}
-p_Procs_FieldZp_la_CPPFLAGS = -Dp_Procs_FieldZp ${P_PROCS_CPPFLAGS_COMMON} ${NODEBUGDEFS}
-
-p_Procs_FieldGeneral_g_la_CPPFLAGS = -Dp_Procs_FieldGeneral ${P_PROCS_CPPFLAGS_COMMON}
-p_Procs_FieldIndep_g_la_CPPFLAGS = -Dp_Procs_FieldIndep ${P_PROCS_CPPFLAGS_COMMON}
-p_Procs_FieldQ_g_la_CPPFLAGS = -Dp_Procs_FieldQ ${P_PROCS_CPPFLAGS_COMMON}
-p_Procs_FieldZp_g_la_CPPFLAGS = -Dp_Procs_FieldZp ${P_PROCS_CPPFLAGS_COMMON}
+p_Procs_FieldGeneral_la_CPPFLAGS = ${AM_CPPFLAGS} -Dp_Procs_FieldGeneral ${P_PROCS_CPPFLAGS_COMMON} ${NODEBUGDEFS}
+p_Procs_FieldIndep_la_CPPFLAGS = ${AM_CPPFLAGS} -Dp_Procs_FieldIndep ${P_PROCS_CPPFLAGS_COMMON} ${NODEBUGDEFS}
+p_Procs_FieldQ_la_CPPFLAGS = ${AM_CPPFLAGS} -Dp_Procs_FieldQ ${P_PROCS_CPPFLAGS_COMMON} ${NODEBUGDEFS}
+p_Procs_FieldZp_la_CPPFLAGS = ${AM_CPPFLAGS} -Dp_Procs_FieldZp ${P_PROCS_CPPFLAGS_COMMON} ${NODEBUGDEFS}
+
+p_Procs_FieldGeneral_g_la_CPPFLAGS = ${AM_CPPFLAGS} -Dp_Procs_FieldGeneral ${P_PROCS_CPPFLAGS_COMMON}
+p_Procs_FieldIndep_g_la_CPPFLAGS = ${AM_CPPFLAGS} -Dp_Procs_FieldIndep ${P_PROCS_CPPFLAGS_COMMON}
+p_Procs_FieldQ_g_la_CPPFLAGS = ${AM_CPPFLAGS} -Dp_Procs_FieldQ ${P_PROCS_CPPFLAGS_COMMON}
+p_Procs_FieldZp_g_la_CPPFLAGS = ${AM_CPPFLAGS} -Dp_Procs_FieldZp ${P_PROCS_CPPFLAGS_COMMON}
 
 p_Procs_FieldGeneral_la_CXXFLAGS = ${NODEBUGCXXFLAGS}
 p_Procs_FieldIndep_la_CXXFLAGS = ${NODEBUGCXXFLAGS}
@@ -131,7 +131,7 @@ libpolys_g_la_SOURCES = ${SOURCES}
 EXTRA_libpolys_la_SOURCES = templates/p_Procs_Static.cc templates/p_Procs_Dynamic.cc
 
 libpolys_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
-libpolys_la_CPPFLAGS = ${NODEBUGDEFS}
+libpolys_la_CPPFLAGS = ${AM_CPPFLAGS} ${NODEBUGDEFS}
 
 
 libpolys_la_LIBADD = ${top_builddir}/misc/libmisc.la ${top_builddir}/reporter/libreporter.la ${top_builddir}/resources/libresources.la ${top_builddir}/coeffs/libcoeffs.la
@@ -149,7 +149,7 @@ noinst_PROGRAMS = templates/p_Procs_Gene
 templates_p_Procs_Generate_SOURCES = templates/p_Procs_Generate.cc
 templates_p_Procs_Generate_CFLAGS   = ${NODEBUGCFLAGS}
 templates_p_Procs_Generate_CXXFLAGS = ${NODEBUGCXXFLAGS}
-templates_p_Procs_Generate_CPPFLAGS = ${NODEBUGDEFS} ${USE_P_PROCS_STATIC}
+templates_p_Procs_Generate_CPPFLAGS = ${AM_CPPFLAGS} ${NODEBUGDEFS} ${USE_P_PROCS_STATIC}
 templates_p_Procs_Generate_LDADD    = -lreporter -lomalloc
 
 
Index: Source/libpolys/reporter/Makefile.am
===================================================================
--- Source.orig/libpolys/reporter/Makefile.am
+++ Source/libpolys/reporter/Makefile.am
@@ -10,10 +10,10 @@ libreporter_la_CXXFLAGS   = -O3 -fomit-f
 libreporter_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
 # -fdiagnostics-show-option 
 
-libreporter_la_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
-libreporter_g_la_CPPFLAGS = -DHAVE_CONFIG_H
+libreporter_la_CPPFLAGS   = ${AM_CPPFLAGS} -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
+libreporter_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
 
-INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..
+AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..
 
 SOURCES  = dError.c reporter.cc
 libreporter_la_SOURCES   = $(SOURCES)
Index: Source/libpolys/resources/Makefile.am
===================================================================
--- Source.orig/libpolys/resources/Makefile.am
+++ Source/libpolys/resources/Makefile.am
@@ -10,10 +10,10 @@ libresources_la_CXXFLAGS   = -O3 -fomit-
 libresources_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
 # -fdiagnostics-show-option 
 
-libresources_la_CPPFLAGS   = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
-libresources_g_la_CPPFLAGS = -DHAVE_CONFIG_H
+libresources_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
+libresources_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
 
-INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..
+AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..
 
 SOURCES = feFopen.cc feResource.cc
 libresources_la_SOURCES   = $(SOURCES)
Index: Source/libpolys/tests/Makefile.am
===================================================================
--- Source.orig/libpolys/tests/Makefile.am
+++ Source/libpolys/tests/Makefile.am
@@ -8,7 +8,7 @@ endif
 
 
 
-INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} ${FACTORY_CFLAGS} ${GMP_CFLAGS} ${NTL_CFLAGS} 
+AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} ${FACTORY_CFLAGS} ${GMP_CFLAGS} ${NTL_CFLAGS}
 
 TESTS = simple_test \
     coeffs_test_s_r coeffs_test_s_g coeffs_test_d_r coeffs_test_d_g \
@@ -60,13 +60,13 @@ polys_test_d_r_CXXFLAGS = ${RELEASECXXFL
 rings_test_d_r_CXXFLAGS = ${RELEASECXXFLAGS}
 
 
-coeffs_test_s_r_CPPFLAGS =${RELEASECPPFLAGS} 
-polys_test_s_r_CPPFLAGS = ${RELEASECPPFLAGS}
-rings_test_s_r_CPPFLAGS = ${RELEASECPPFLAGS}
-
-coeffs_test_d_r_CPPFLAGS =${RELEASECPPFLAGS} 
-polys_test_d_r_CPPFLAGS = ${RELEASECPPFLAGS}
-rings_test_d_r_CPPFLAGS = ${RELEASECPPFLAGS}
+coeffs_test_s_r_CPPFLAGS =${AM_CPPFLAGS} ${RELEASECPPFLAGS}
+polys_test_s_r_CPPFLAGS = ${AM_CPPFLAGS} ${RELEASECPPFLAGS}
+rings_test_s_r_CPPFLAGS = ${AM_CPPFLAGS} ${RELEASECPPFLAGS}
+
+coeffs_test_d_r_CPPFLAGS =${AM_CPPFLAGS} ${RELEASECPPFLAGS}
+polys_test_d_r_CPPFLAGS = ${AM_CPPFLAGS} ${RELEASECPPFLAGS}
+rings_test_d_r_CPPFLAGS = ${AM_CPPFLAGS} ${RELEASECPPFLAGS}
 
 
 ###  -pedantic
@@ -90,13 +90,13 @@ coeffs_test_d_g_CXXFLAGS =${DEBUGCXXFLAG
 polys_test_d_g_CXXFLAGS = ${DEBUGCXXFLAGS}
 rings_test_d_g_CXXFLAGS = ${DEBUGCXXFLAGS}
 
-coeffs_test_d_g_CPPFLAGS =${DEBUGCPPFLAGS} 
-polys_test_d_g_CPPFLAGS = ${DEBUGCPPFLAGS}
-rings_test_d_g_CPPFLAGS = ${DEBUGCPPFLAGS}
-
-coeffs_test_s_g_CPPFLAGS =${DEBUGCPPFLAGS} 
-polys_test_s_g_CPPFLAGS = ${DEBUGCPPFLAGS}
-rings_test_s_g_CPPFLAGS = ${DEBUGCPPFLAGS}
+coeffs_test_d_g_CPPFLAGS =${AM_CPPFLAGS} ${DEBUGCPPFLAGS}
+polys_test_d_g_CPPFLAGS = ${AM_CPPFLAGS} ${DEBUGCPPFLAGS}
+rings_test_d_g_CPPFLAGS = ${AM_CPPFLAGS} ${DEBUGCPPFLAGS}
+
+coeffs_test_s_g_CPPFLAGS =${AM_CPPFLAGS} ${DEBUGCPPFLAGS}
+polys_test_s_g_CPPFLAGS = ${AM_CPPFLAGS} ${DEBUGCPPFLAGS}
+rings_test_s_g_CPPFLAGS = ${AM_CPPFLAGS} ${DEBUGCPPFLAGS}
 
 AM_LDFLAGS = -L${top_builddir}/polys -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/resources -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${top_builddir}/../findexec
 
Index: Source/numeric/Makefile.am
===================================================================
--- Source.orig/numeric/Makefile.am
+++ Source/numeric/Makefile.am
@@ -13,10 +13,10 @@ libnumeric_la_CXXFLAGS   = -O3 -fomit-fr
 libnumeric_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
 # -fdiagnostics-show-option 
 
-libnumeric_la_CPPFLAGS   = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
-libnumeric_g_la_CPPFLAGS = -DHAVE_CONFIG_H 
+libnumeric_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
+libnumeric_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
 
-INCLUDES = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys ${GMP_CFLAGS} ${FACTORY_CFLAGS} ${NTL_CFLAGS}
+AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys ${GMP_CFLAGS} ${FACTORY_CFLAGS} ${NTL_CFLAGS}
 
 SOURCES  = mpr_base.cc mpr_inout.cc mpr_numeric.cc
 libnumeric_la_SOURCES   = $(SOURCES)
Index: Source/omalloc/Makefile.am
===================================================================
--- Source.orig/omalloc/Makefile.am
+++ Source/omalloc/Makefile.am
@@ -26,7 +26,7 @@ omalloc_provide.c omAllocFunc.c
 
 EXTRA_DIST = omalloc.c omtTestAlloc.c omtTest.h omMmap.c
 
-INCLUDES=-I${top_srcdir}/.. -I${top_builddir}/..
+AM_CPPFLAGS = -I${top_srcdir}/.. -I${top_builddir}/..
 
 libomalloc_la_SOURCES=$(SOURCES) $(noinst_HEADERS)
 libomalloc_g_la_SOURCES=$(SOURCES) $(noinst_HEADERS)
@@ -37,8 +37,8 @@ libomalloc_g_la_LDFLAGS = ${libomalloc_l
 nodist_libomalloc_la_SOURCES = omConfig.h mylimits.h omalloc.h omTables.inc omTables.h
 nodist_libomalloc_g_la_SOURCES = omConfig.h omalloc.h omTables.inc omTables.h
 
-libomalloc_la_CPPFLAGS= -DHAVE_CONFIG_H -DOM_NDEBUG
-libomalloc_g_la_CPPFLAGS= -DHAVE_CONFIG_H
+libomalloc_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DOM_NDEBUG
+libomalloc_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
 
 BUILT_SOURCES = omTables.inc omTables.h
 
@@ -51,7 +51,7 @@ omTables.h: omTables
 noinst_PROGRAMS = omTables
 omTables_SOURCES = omAllocPrivate.h omTables.c mylimits.h
 nodist_omTables_SOURCES = omConfig.h
-omTables_CPPFLAGS = -DOM_GENERATE_INC  -DHAVE_CONFIG_H
+omTables_CPPFLAGS = ${AM_CPPFLAGS} -DOM_GENERATE_INC -DHAVE_CONFIG_H
 
 CLEANFILES = $(BUILT_SOURCES)
 
@@ -67,18 +67,18 @@ check_PROGRAMS = $(TESTS)
 OMTTESTSSOURCES = omtTestReal.c omtTestDebug.c omtTestKeep.c omtTestError.c omtTest.c
 
 omtTest_s_g_SOURCES = $(OMTTESTSSOURCES)
-omtTest_s_g_CPPFLAGS = -DHAVE_CONFIG_H
+omtTest_s_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
 omtTest_s_g_CFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE}
 omtTest_s_g_LDADD = libomalloc_g.la
 omtTest_s_g_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc -static
 
-omtTest_s_m_CPPFLAGS = -DOM_TEST_MALLOC  -DHAVE_CONFIG_H
+omtTest_s_m_CPPFLAGS = ${AM_CPPFLAGS} -DOM_TEST_MALLOC -DHAVE_CONFIG_H
 omtTest_s_m_SOURCES  = $(OMTTESTSSOURCES)
 omtTest_s_m_LDADD = libomalloc_g.la
 omtTest_s_m_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc -static
 
 omtTest_s_r_SOURCES = $(OMTTESTSSOURCES)
-omtTest_s_r_CPPFLAGS = -DOM_NDEBUG
+omtTest_s_r_CPPFLAGS = ${AM_CPPFLAGS} -DOM_NDEBUG
 omtTest_s_r_CFLAGS = -O3 ${PIPE}
 omtTest_s_r_LDADD = libomalloc.la
 omtTest_s_r_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc -static
@@ -86,18 +86,18 @@ omtTest_s_r_LDFLAGS = -L${top_buildd
 
 
 omtTest_d_g_SOURCES = $(OMTTESTSSOURCES)
-omtTest_d_g_CPPFLAGS = -DHAVE_CONFIG_H
+omtTest_d_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
 omtTest_d_g_CFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE}
 omtTest_d_g_LDADD = libomalloc_g.la
 omtTest_d_g_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc
 
-omtTest_d_m_CPPFLAGS = -DOM_TEST_MALLOC  -DHAVE_CONFIG_H
+omtTest_d_m_CPPFLAGS = ${AM_CPPFLAGS} -DOM_TEST_MALLOC -DHAVE_CONFIG_H
 omtTest_d_m_SOURCES  = $(OMTTESTSSOURCES)
 omtTest_d_m_LDADD = libomalloc_g.la
 omtTest_d_m_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc
 
 omtTest_d_r_SOURCES = $(OMTTESTSSOURCES)
-omtTest_d_r_CPPFLAGS = -DOM_NDEBUG
+omtTest_d_r_CPPFLAGS = ${AM_CPPFLAGS} -DOM_NDEBUG
 omtTest_d_r_CFLAGS = -O3 ${PIPE}
 omtTest_d_r_LDADD = libomalloc.la
 omtTest_d_r_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc
Index: Source/xalloc/Makefile.am
===================================================================
--- Source.orig/xalloc/Makefile.am
+++ Source/xalloc/Makefile.am
@@ -9,7 +9,7 @@ libomalloc_include_HEADERS = omalloc.h
 
 SOURCES = dummy.c
 
-INCLUDES = -I${srcdir}
+AM_CPPFLAGS = -I${srcdir}
 
 libomalloc_la_SOURCES  =$(SOURCES)
 libomalloc_g_la_SOURCES=$(SOURCES)
@@ -20,6 +20,6 @@ libomalloc_g_la_CFLAGS	= -g -Wextra -Wal
 libomalloc_la_CXXFLAGS	= -O3 ${PIPE}
 libomalloc_g_la_CXXFLAGS= -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE}
 
-libomalloc_la_CPPFLAGS  = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
-libomalloc_g_la_CPPFLAGS= -DHAVE_CONFIG_H 
+libomalloc_la_CPPFLAGS  = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
+libomalloc_g_la_CPPFLAGS= ${AM_CPPFLAGS} -DHAVE_CONFIG_H

Places

File singular-am_cppflags.diff of Package singular (Revision a2434fc071129b8f8dda39ed11ee29ca)

Places