Changeset 4bc0ab9 in git for libpolys


Ignore:
Timestamp:
Mar 29, 2012, 2:15:30 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
Children:
9f524dff0ae56f9b1800fbdba56cdbb6f6b120b3
Parents:
fca452a782a426cceaa9e98f3a95b5a5acccd04f
Message:
updated all active automake files: INCLUDES -> AM_CPPFLAGS

chg: ... and some minor cleanup
Location:
libpolys
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • libpolys/coeffs/Makefile.am

    rfca452 r4bc0ab9  
    44CXXTEMPLFLAGS = 
    55## -fno-implicit-templates
     6
     7AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${top_srcdir}/../factory/include -I${top_builddir}/../factory/include ${FACTORY_CFLAGS} ${GMP_CFLAGS} ${NTL_CFLAGS}
    68
    79libcoeffs_la_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
     
    1214# -fdiagnostics-show-option
    1315
    14 libcoeffs_la_CPPFLAGS   = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    15 libcoeffs_g_la_CPPFLAGS = -DHAVE_CONFIG_H
     16libcoeffs_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     17libcoeffs_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    1618
    1719
     
    2123#       mpr_complex.h mpr_global.h
    2224
    23 
    24 INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${top_srcdir}/../factory/include -I${top_builddir}/../factory/include ${FACTORY_CFLAGS} ${GMP_CFLAGS} ${NTL_CFLAGS}
    2525
    2626SOURCES = \
     
    8686
    8787
    88 test_s_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    89 test_s_g_CPPFLAGS = -DHAVE_CONFIG_H
     88test_s_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     89test_s_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    9090
    91 test_d_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    92 test_d_g_CPPFLAGS = -DHAVE_CONFIG_H
     91test_d_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     92test_d_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
     93
    9394
    9495
  • libpolys/misc/Makefile.am

    rfca452 r4bc0ab9  
     1CXXTEMPLFLAGS      = 
     2## -fno-implicit-templates
    13noinst_LTLIBRARIES = libmisc.la libmisc_g.la
    24# libmiscdir = $(libdir)/singular
    35
    4 CXXTEMPLFLAGS      =  ## -fno-implicit-templates
     6AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..
     7
    58
    69libmisc_la_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
     
    1114# -fdiagnostics-show-option
    1215
    13 libmisc_la_CPPFLAGS   = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    14 libmisc_g_la_CPPFLAGS = -DHAVE_CONFIG_H
    15 
    16 INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..
     16libmisc_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     17libmisc_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    1718
    1819SOURCES  = intvec.cc int64vec.cc options.c
  • libpolys/polys/Makefile.am

    rfca452 r4bc0ab9  
    1010AM_CXXFLAGS     = ${PIPE} ${CXXTEMPLFLAGS}
    1111
    12 INCLUDES        = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${top_srcdir}/../factory/include -I${top_builddir}/../factory/include ${GMP_CFLAGS}
    1312AM_LDFLAGS      = -L${abs_top_builddir}/coeffs -L${abs_top_builddir}/reporter -L${abs_top_builddir}/../omalloc -L${abs_builddir}
     13AM_CPPFLAGS     = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${top_srcdir}/../factory/include -I${top_builddir}/../factory/include ${GMP_CFLAGS}
     14
    1415
    1516if ENABLE_P_PROCS_STATIC
     
    6465        templates/p_Merge_q__T.cc templates/p_Add_q__T.cc templates/p_Neg__T.cc
    6566
    66 P_PROCS_CPPFLAGS_COMMON = -DDYNAMIC_VERSION
     67P_PROCS_CPPFLAGS_COMMON = ${AM_CPPFLAGS} -DDYNAMIC_VERSION
    6768
    6869p_Procs_FieldGeneral_la_CPPFLAGS = -Dp_Procs_FieldGeneral ${P_PROCS_CPPFLAGS_COMMON} ${NODEBUGDEFS}
     
    133134
    134135libpolys_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
    135 libpolys_la_CPPFLAGS = ${NODEBUGDEFS}
     136libpolys_la_CPPFLAGS = ${NODEBUGDEFS} ${AM_CPPFLAGS}
    136137
    137138
     
    149150templates_p_Procs_Generate_CFLAGS   = ${NODEBUGCFLAGS}
    150151templates_p_Procs_Generate_CXXFLAGS = ${NODEBUGCXXFLAGS}
    151 templates_p_Procs_Generate_CPPFLAGS = ${NODEBUGDEFS} ${USE_P_PROCS_STATIC}
     152templates_p_Procs_Generate_CPPFLAGS = ${NODEBUGDEFS} ${USE_P_PROCS_STATIC} ${AM_CPPFLAGS}
    152153templates_p_Procs_Generate_LDADD    = -lreporter -lomalloc
    153154
  • libpolys/reporter/Makefile.am

    rfca452 r4bc0ab9  
     1CXXTEMPLFLAGS = 
     2## -fno-implicit-templates
    13noinst_LTLIBRARIES=libreporter.la libreporter_g.la
    24# libreporterdir = $(libdir)/singular
    35
    4 CXXTEMPLFLAGS =  ## -fno-implicit-templates
     6AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..
     7
    58
    69libreporter_la_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
     
    1114# -fdiagnostics-show-option
    1215
    13 libreporter_la_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
    14 libreporter_g_la_CPPFLAGS = -DHAVE_CONFIG_H
     16libreporter_la_CPPFLAGS   = ${AM_CPPFLAGS} -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
     17libreporter_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    1518
    16 INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..
    1719
    1820SOURCES  = dError.c reporter.cc
  • libpolys/tests/Makefile.am

    rfca452 r4bc0ab9  
    99
    1010
    11 INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${top_srcdir}/../factory/include -I${top_builddir}/../factory/include ${FACTORY_CFLAGS} ${GMP_CFLAGS} ${NTL_CFLAGS}
     11AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${top_srcdir}/../factory/include -I${top_builddir}/../factory/include ${FACTORY_CFLAGS} ${GMP_CFLAGS} ${NTL_CFLAGS}
    1212
    1313TESTS = simple_test \
     
    4141RELEASECFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    4242RELEASECXXFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    43 RELEASECPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     43RELEASECPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    4444
    4545coeffs_test_s_r_CFLAGS =${RELEASECFLAGS}
     
    7373DEBUGCFLAGS = $(AM_CFLAGS) -g -Wextra -Wall -Wno-long-long ${PIPE}
    7474DEBUGCXXFLAGS = $(AM_CXXFLAGS) ${DEBUGCFLAGS} ${CXXTEMPLFLAGS}
    75 DEBUGCPPFLAGS = -DHAVE_CONFIG_H
     75DEBUGCPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    7676
    7777coeffs_test_s_g_CFLAGS =${DEBUGCFLAGS}
Note: See TracChangeset for help on using the changeset viewer.