Changeset 1d3be3 in git


Ignore:
Timestamp:
Nov 22, 2011, 7:48:56 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
Children:
bd948cbaacc9667794c8657da135a320fe94c131
Parents:
097c71a9e55bb76830c9f5b243182439619170a6
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-22 19:48:56+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-23 01:56:36+01:00
Message:
ADD: consistently define HAVE_CONFIG_H in automake CPPFLAGS
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • Singular/Makefile.am

    r097c71 r1d3be3  
    2828# -fdiagnostics-show-option
    2929
    30 libSingular_la_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG -DLIBSINGULAR
    31 libSingular_g_la_CPPFLAGS = -DLIBSINGULAR
     30
     31libSingular_la_CPPFLAGS   = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DLIBSINGULAR
     32libSingular_g_la_CPPFLAGS = -DHAVE_CONFIG_H -DLIBSINGULAR
    3233
    3334SOURCES =    Minor.cc\
    … …  
    184185gentable2_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    185186gentable2_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    186 gentable2_CPPFLAGS = -DNDEBUG -DOM_NDEBUG
     187gentable2_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    187188
    188189
    … …  
    190191gentable1_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    191192gentable1_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    192 gentable1_CPPFLAGS = -DNDEBUG -DOM_NDEBUG
     193gentable1_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    193194
    194195feOpt_SOURCES = feOptGen.cc feOptGen.h
    195196feOpt_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    196 feOpt_CPPFLAGS = -DNDEBUG -DOM_NDEBUG
     197feOpt_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    197198
    198199feOptES_SOURCES = feOptGen.cc feOptGen.h
    199200feOptES_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    200 feOptES_CPPFLAGS = -DNDEBUG -DOM_NDEBUG -DESINGULAR
     201feOptES_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DESINGULAR
    201202
    202203feOptTS_SOURCES = feOptGen.cc feOptGen.h
    203204feOptTS_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    204 feOptTS_CPPFLAGS = -DNDEBUG -DOM_NDEBUG -DTSINGULAR
     205feOptTS_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DTSINGULAR
    205206
    206207########################### Singular* #########################
    … …  
    223224Singularg_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    224225
    225 Singular_CPPFLAGS = -DNDEBUG -DOM_NDEBUG
    226 # Singularg_CPPFLAGS =
     226Singular_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     227Singularg_CPPFLAGS = -DHAVE_CONFIG_H
    227228
    228229Singular_LDFLAGS = -static
    … …  
    245246Singulardg_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    246247
    247 Singulard_CPPFLAGS = -DNDEBUG -DOM_NDEBUG
    248 # Singulardg_CPPFLAGS =
     248Singulard_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     249Singulardg_CPPFLAGS = -DHAVE_CONFIG_H
    249250
    250251
    … …  
    286287test_s_g_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    287288
    288 test_s_r_CPPFLAGS = -DNDEBUG -DOM_NDEBUG
    289 # test_s_g_CPPFLAGS =
     289test_s_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     290test_s_g_CPPFLAGS = -DHAVE_CONFIG_H
    290291
    291292test_s_r_LDFLAGS = -static
    … …  
    307308test_d_g_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    308309
    309 test_d_r_CPPFLAGS = -DNDEBUG -DOM_NDEBUG
    310 # test_d_g_CPPFLAGS =
     310test_d_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     311test_d_g_CPPFLAGS = -DHAVE_CONFIG_H
    311312
    312313#########################################################

  • factory/Makefile.am

    r097c71 r1d3be3  
    9898libfactory_g_la_SOURCES = $(SOURCES)
    9999
     100libfactory_la_CPPFLAGS  = -DHAVE_CONFIG_H -DOM_NDEBUG -DNDEBUG
     101libfactory_g_la_CPPFLAGS= -DHAVE_CONFIG_H
     102
    100103nodist_libfactory_la_SOURCES = cplusplus.h factory.h factoryconf.h
    101104nodist_libfactory_g_la_SOURCES = cplusplus.h factory.h factoryconf.h

  • kernel/Makefile.am

    r097c71 r1d3be3  
    2323# -fdiagnostics-show-option
    2424
    25 libkernel_la_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG
    26 #libkernel_g_la_CPPFLAGS =
     25libkernel_la_CPPFLAGS   = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     26libkernel_g_la_CPPFLAGS = -DHAVE_CONFIG_H
    2727
    2828INCLUDES = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) $(FACTORY_CFLAGS) $(NTL_CFLAGS)
    … …  
    103103test_s_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    104104
    105 test_s_r_CPPFLAGS = -DNDEBUG -DOM_NDEBUG
    106 #test_s_g_CPPFLAGS =
     105test_s_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     106test_s_g_CPPFLAGS = -DHAVE_CONFIG_H
    107107
    108108test_s_r_LDFLAGS = -static
    … …  
    122122test_d_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    123123
    124 test_d_r_CPPFLAGS = -DNDEBUG -DOM_NDEBUG
    125 #test_d_g_CPPFLAGS =
     124test_d_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     125test_d_g_CPPFLAGS = -DHAVE_CONFIG_H
    126126
    127127

  • libpolys/coeffs/Makefile.am

    r097c71 r1d3be3  
    1212# -fdiagnostics-show-option
    1313
    14 libcoeffs_la_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG
    15 libcoeffs_g_la_CPPFLAGS =
     14libcoeffs_la_CPPFLAGS   = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     15libcoeffs_g_la_CPPFLAGS = -DHAVE_CONFIG_H
    1616
    1717
    … …  
    8282test_d_g_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
    8383
    84 test_s_r_CPPFLAGS = -DNDEBUG -DOM_NDEBUG
    85 test_s_g_CPPFLAGS =
    8684
    87 test_d_r_CPPFLAGS = -DNDEBUG -DOM_NDEBUG
    88 test_d_g_CPPFLAGS =
     85
     86test_s_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     87test_s_g_CPPFLAGS = -DHAVE_CONFIG_H
     88
     89test_d_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     90test_d_g_CPPFLAGS = -DHAVE_CONFIG_H
    8991
    9092

  • libpolys/misc/Makefile.am

    r097c71 r1d3be3  
    1111# -fdiagnostics-show-option
    1212
    13 libmisc_la_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG
    14 #libmisc_g_la_CPPFLAGS =
     13libmisc_la_CPPFLAGS   = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     14libmisc_g_la_CPPFLAGS = -DHAVE_CONFIG_H
    1515
    1616INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..

  • libpolys/resources/Makefile.am

    r097c71 r1d3be3  
    1111# -fdiagnostics-show-option
    1212
    13 libresources_la_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG
    14 #libresources_g_la_CPPFLAGS =
     13libresources_la_CPPFLAGS   = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     14libresources_g_la_CPPFLAGS = -DHAVE_CONFIG_H
    1515
    1616INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..

  • libpolys/tests/Makefile.am

    r097c71 r1d3be3  
    4141RELEASECFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    4242RELEASECXXFLAGS = -O3 -fomit-frame-pointer --no-rtti ${PIPE}
    43 RELEASECPPFLAGS = -DNDEBUG -DOM_NDEBUG
     43RELEASECPPFLAGS = -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 
     75DEBUGCPPFLAGS = -DHAVE_CONFIG_H
    7676
    7777coeffs_test_s_g_CFLAGS =${DEBUGCFLAGS}
    … …  
    9191rings_test_d_g_CXXFLAGS = ${DEBUGCXXFLAGS}
    9292
     93coeffs_test_d_g_CPPFLAGS =${DEBUGCPPFLAGS}
     94polys_test_d_g_CPPFLAGS = ${DEBUGCPPFLAGS}
     95rings_test_d_g_CPPFLAGS = ${DEBUGCPPFLAGS}
    9396
     97coeffs_test_s_g_CPPFLAGS =${DEBUGCPPFLAGS}
     98polys_test_s_g_CPPFLAGS = ${DEBUGCPPFLAGS}
     99rings_test_s_g_CPPFLAGS = ${DEBUGCPPFLAGS}
    94100
    95101AM_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

  • numeric/Makefile.am

    r097c71 r1d3be3  
    1111# -fdiagnostics-show-option
    1212
    13 libnumeric_la_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG
    14 #libnumeric_g_la_CPPFLAGS =
     13libnumeric_la_CPPFLAGS   = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     14libnumeric_g_la_CPPFLAGS = -DHAVE_CONFIG_H
    1515
    1616INCLUDES = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys ${GMP_CFLAGS} ${FACTORY_CFLAGS} ${NTL_CFLAGS}
Note: See TracChangeset for help on using the changeset viewer.