Changeset 4bc0ab9 in git


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

chg: ... and some minor cleanup
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • findexec/Makefile.am

    rfca452 r4bc0ab9  
    1313# -fdiagnostics-show-option
    1414
    15 libfindexec_la_CPPFLAGS   = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    16 libfindexec_g_la_CPPFLAGS = -DHAVE_CONFIG_H
     15AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir}
    1716
    18 INCLUDES = -I${top_srcdir} -I${top_builddir}
     17libfindexec_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     18libfindexec_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    1919
    2020SOURCES  = omFindExec.c feResource.cc feFopen.cc

  • kernel/Makefile.am

    rfca452 r4bc0ab9  
    2323# -fdiagnostics-show-option
    2424
    25 libkernel_la_CPPFLAGS   = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    26 libkernel_g_la_CPPFLAGS = -DHAVE_CONFIG_H
     25AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) -I${top_srcdir}/factory/include -I${top_builddir}/factory/include $(FACTORY_CFLAGS) $(NTL_CFLAGS)
    2726
    28 INCLUDES = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) -I${top_srcdir}/factory/include -I${top_builddir}/factory/include $(FACTORY_CFLAGS) $(NTL_CFLAGS)
     27libkernel_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     28libkernel_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    2929
    3030SOURCES = polys.cc febase.cc feread.cc \
    … …  
    103103test_s_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g  -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    104104
    105 test_s_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    106 test_s_g_CPPFLAGS = -DHAVE_CONFIG_H
     105test_s_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     106test_s_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    107107
    108108test_s_r_LDFLAGS = -static
    … …  
    122122test_d_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g  -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    123123
    124 test_d_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    125 test_d_g_CPPFLAGS = -DHAVE_CONFIG_H
    126 
     124test_d_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     125test_d_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    127126
    128127

  • 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}

  • numeric/Makefile.am

    rfca452 r4bc0ab9  
    1111# -fdiagnostics-show-option
    1212
    13 libnumeric_la_CPPFLAGS   = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    14 libnumeric_g_la_CPPFLAGS = -DHAVE_CONFIG_H
     13AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys ${GMP_CFLAGS} -I${top_srcdir}/factory/include -I${top_builddir}/factory/include ${FACTORY_CFLAGS} ${NTL_CFLAGS}
    1514
    16 INCLUDES = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys ${GMP_CFLAGS} -I${top_srcdir}/factory/include -I${top_builddir}/factory/include ${FACTORY_CFLAGS} ${NTL_CFLAGS}
     15libnumeric_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     16libnumeric_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    1717
    1818SOURCES  = mpr_base.cc mpr_inout.cc mpr_numeric.cc

  • omalloc/Makefile.am

    rfca452 r4bc0ab9  
    2727EXTRA_DIST = omalloc.c omtTestAlloc.c omtTest.h omMmap.c
    2828
    29 INCLUDES=-I${abs_top_srcdir}/.. -I${abs_top_builddir}/..
     29AM_CPPFLAGS =-I${abs_top_srcdir}/.. -I${abs_top_builddir}/..
    3030
    3131libomalloc_la_SOURCES=$(SOURCES) $(noinst_HEADERS)
    … …  
    4040### libomalloc_la_CPPFLAGS= -DOM_ALLOC_INTERNAL -DHAVE_CONFIG_H -DOM_NDEBUG
    4141
    42 libomalloc_la_CPPFLAGS= -DOM_ALLOC_INTERNAL -DHAVE_CONFIG_H
    43 libomalloc_g_la_CPPFLAGS= -DOM_ALLOC_INTERNAL -DHAVE_CONFIG_H
     42libomalloc_la_CPPFLAGS  = ${AM_CPPFLAGS} -DOM_ALLOC_INTERNAL -DHAVE_CONFIG_H
     43libomalloc_g_la_CPPFLAGS= ${AM_CPPFLAGS} -DOM_ALLOC_INTERNAL -DHAVE_CONFIG_H
    4444
    4545BUILT_SOURCES = omTables.inc omTables.h
    … …  
    5454omTables_SOURCES = omAllocPrivate.h omTables.c mylimits.h
    5555nodist_omTables_SOURCES = omConfig.h
    56 omTables_CPPFLAGS = -DOM_GENERATE_INC  -DHAVE_CONFIG_H
     56omTables_CPPFLAGS = ${AM_CPPFLAGS} -DOM_GENERATE_INC  -DHAVE_CONFIG_H
    5757
    5858CLEANFILES = $(BUILT_SOURCES)
    … …  
    8383
    8484omtTest_s_g_SOURCES = $(OMTTESTSSOURCES)
    85 omtTest_s_g_CPPFLAGS = -DHAVE_CONFIG_H
    86 omtTest_s_g_CFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE}
    87 omtTest_s_g_LDADD = libomalloc_g.la
     85omtTest_s_g_CPPFLAGS= ${AM_CPPFLAGS} -DHAVE_CONFIG_H
     86omtTest_s_g_CFLAGS  = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE}
     87omtTest_s_g_LDADD   = libomalloc_g.la
    8888omtTest_s_g_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc -static
    8989
    90 omtTest_s_m_CPPFLAGS = -DOM_TEST_MALLOC  -DHAVE_CONFIG_H
    91 omtTest_s_m_SOURCES  = $(OMTTESTSSOURCES)
    92 omtTest_s_m_LDADD = libomalloc_g.la
     90omtTest_s_m_CPPFLAGS= ${AM_CPPFLAGS} -DOM_TEST_MALLOC  -DHAVE_CONFIG_H
     91omtTest_s_m_SOURCES = $(OMTTESTSSOURCES)
     92omtTest_s_m_LDADD   = libomalloc_g.la
    9393omtTest_s_m_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc -static
    9494
    9595omtTest_s_r_SOURCES = $(OMTTESTSSOURCES)
    96 omtTest_s_r_CPPFLAGS = -DOM_NDEBUG
    97 omtTest_s_r_CFLAGS = -O3 ${PIPE}
    98 omtTest_s_r_LDADD = libomalloc.la
     96omtTest_s_r_CPPFLAGS= ${AM_CPPFLAGS} -DOM_NDEBUG
     97omtTest_s_r_CFLAGS  = -O3 ${PIPE}
     98omtTest_s_r_LDADD   = libomalloc.la
    9999omtTest_s_r_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc -static
    100100
    … …  
    102102
    103103omtTest_d_g_SOURCES = $(OMTTESTSSOURCES)
    104 omtTest_d_g_CPPFLAGS = -DHAVE_CONFIG_H
    105 omtTest_d_g_CFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE}
    106 omtTest_d_g_LDADD = libomalloc_g.la
     104omtTest_d_g_CPPFLAGS= ${AM_CPPFLAGS} -DHAVE_CONFIG_H
     105omtTest_d_g_CFLAGS  = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE}
     106omtTest_d_g_LDADD   = libomalloc_g.la
    107107omtTest_d_g_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc
    108108
    109 omtTest_d_m_CPPFLAGS = -DOM_TEST_MALLOC  -DHAVE_CONFIG_H
    110 omtTest_d_m_SOURCES  = $(OMTTESTSSOURCES)
    111 omtTest_d_m_LDADD = libomalloc_g.la
     109omtTest_d_m_CPPFLAGS= ${AM_CPPFLAGS} -DOM_TEST_MALLOC  -DHAVE_CONFIG_H
     110omtTest_d_m_SOURCES = $(OMTTESTSSOURCES)
     111omtTest_d_m_LDADD   = libomalloc_g.la
    112112omtTest_d_m_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc
    113113
    114114omtTest_d_r_SOURCES = $(OMTTESTSSOURCES)
    115 omtTest_d_r_CPPFLAGS = -DOM_NDEBUG
    116 omtTest_d_r_CFLAGS = -O3 ${PIPE}
    117 omtTest_d_r_LDADD = libomalloc.la
     115omtTest_d_r_CPPFLAGS= ${AM_CPPFLAGS} -DOM_NDEBUG
     116omtTest_d_r_CFLAGS  = -O3 ${PIPE}
     117omtTest_d_r_LDADD   = libomalloc.la
    118118omtTest_d_r_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc

  • xalloc/Makefile.am

    rfca452 r4bc0ab9  
    1010SOURCES = dummy.c
    1111
    12 INCLUDES = -I${srcdir}
     12AM_CPPFLAGS = -I${srcdir}
    1313
    1414libomalloc_la_SOURCES  =$(SOURCES)
    … …  
    2121libomalloc_g_la_CXXFLAGS= -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE}
    2222
    23 libomalloc_la_CPPFLAGS  = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    24 libomalloc_g_la_CPPFLAGS= -DHAVE_CONFIG_H
     23libomalloc_la_CPPFLAGS  = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     24libomalloc_g_la_CPPFLAGS= ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    2525
Note: See TracChangeset for help on using the changeset viewer.