Changeset 667d33 in git
- Timestamp:
- Jan 6, 2014, 5:18:21 PM (10 years ago)
- Branches:
- (u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
- Children:
- b1b9e1f448aca273a22cb770fd8bde277e3e8a1d
- Parents:
- 17fe09de3facd16159d0da4c0fb5bd476fb4180d
- git-author:
- Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-01-06 17:18:21+01:00
- git-committer:
- Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-01-06 17:19:39+01:00
- Files:
-
- 6 edited
-
Singular/Makefile.am (modified) (2 diffs)
-
factory/Makefile.am (modified) (4 diffs)
-
kernel/Makefile.am (modified) (3 diffs)
-
libpolys/coeffs/Makefile.am (modified) (4 diffs)
-
libpolys/tests/Makefile.am (modified) (3 diffs)
-
omalloc/Makefile.am (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
Singular/Makefile.am
r17fe09 r667d33 1 1 ACLOCAL_AMFLAGS = -I ../m4 2 3 #LD_DYN_FLAGS = -ldl -rdynamic4 #LD_LIBC = -lc5 #SFLAGS = -fpic -DPIC6 #SLDFLAGS = -shared7 #STATIC_LDFLAGS = -static8 9 # WARNCFLAGS = -Wunused-parameter10 # clang has also: -Wunneeded-internal-declaration11 2 12 3 GIT_VERSION := $(shell $(top_srcdir)/git-version-gen $(top_srcdir)/.tarball-git-version) … … 300 291 TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${top_builddir}' 301 292 302 TESTS=test -s-r test-d-r293 TESTS=test 303 294 304 295 check_PROGRAMS=$(TESTS) 305 296 306 # Static versions 307 test_s_r_SOURCES = test.cc 297 test_SOURCES = test.cc 308 298 # ${EMBED_PYOBJECT_LDFLAGS} 309 test_s_r_LDADD = libSingular.la 310 311 #-lnumeric -lkernel -lpolys -lcoeffs -lreporter -lmisc \ 312 # $(FACTORY_LIBS) -lomalloc -lresources $(FLINT_LIBS) \ 313 # $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} \ 314 #${EMBED_PYOBJECT} 315 #${EMBED_PYOBJECT_LDFLAGS} 316 317 test_s_r_LDFLAGS = -static ${AM_LDFLAGS} 318 319 # Dynamic versions 320 test_d_r_SOURCES = test.cc 321 test_d_r_LDADD = libSingular.la 299 test_LDADD = libSingular.la 322 300 323 301 ######################################################### -
factory/Makefile.am
r17fe09 r667d33 4 4 SUBDIRS=$(PACKAGES) 5 5 6 # CXXTEMPLFLAGS=-ftrapv7 ## -fno-implicit-templates8 9 6 AM_CPPFLAGS = -I${builddir}/include -I${srcdir}/include $(FLINT_CFLAGS) ${GMP_CFLAGS} ${NTL_CFLAGS} ${OMALLOC_CFLAGS} -DHAVE_CONFIG_H 10 7 11 # if WANT_DEBUG12 # LIB_G=libfactory_g.la13 # else14 # LIB_G=15 # endif16 17 8 lib_LTLIBRARIES = libfactory.la 18 # ${LIB_G} 19 20 # libfactory_la_CXXFLAGS = -O3 -fomit-frame-pointer ${CXXTEMPLFLAGS} 9 21 10 libfactory_la_LIBADD = ${builddir}/libfac/libfac.la $(FLINT_LIBS) ${GMP_LIBS} ${NTL_LIBS} 22 11 ### libfactory_la_LDFLAGS = -release ${PACKAGE_VERSION} 23 # libfactory_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${CXXTEMPLFLAGS}24 #libfactory_g_la_LIBADD = ${builddir}/libfac/libfac_g.la $(FLINT_LIBS) ${GMP_LIBS} ${NTL_LIBS}25 #libfactory_g_la_LDFLAGS = -release ${PACKAGE_VERSION}26 27 28 12 29 13 # factory source files … … 110 94 111 95 libfactory_la_SOURCES = $(SOURCES) 112 # libfactory_g_la_SOURCES = $(SOURCES)113 114 # libfactory_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DOM_NDEBUG -DNDEBUG115 # libfactory_la_CPPFLAGS= ${AM_CPPFLAGS} -DHAVE_CONFIG_H116 96 117 97 nodist_libfactory_la_SOURCES = cplusplus.h factory.h factoryconf.h 118 # nodist_libfactory_g_la_SOURCES = cplusplus.h factory.h factoryconf.h119 98 120 99 # factory header files … … 303 282 ## Test program 304 283 ## 305 #if WANT_DEBUG 306 # TESTS = test-s-g test-s-r test-d-g test-d-r 307 #else 308 TESTS = test-s-r test-d-r 309 #endif 284 TESTS = test 285 310 286 check_PROGRAMS = $(TESTS) 311 312 AM_LDFLAGS = -L${builddir}313 287 314 288 TESTSSOURCES = test.cc … … 319 293 TESTADDLIBDEBUG = $(TESTADDLIBDIRS) $(OMALLOC_G_LDADD) 320 294 321 # test_s_g_SOURCES = $(TESTSSOURCES) 322 # test_s_g_CFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long -fomit-frame-pointer 323 # #ftmpl_inst.o 324 # test_s_g_LDADD = -lfactory $(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(TESTADDLIBDEBUG) 325 326 test_s_r_SOURCES = $(TESTSSOURCES) 327 #test_s_r_CFLAGS = -O3 -fomit-frame-pointer 328 #ftmpl_inst.o 329 test_s_r_LDADD = -lfactory $(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(TESTADDLIB) 330 331 test_s_r_LDFLAGS = -static ${AM_LDFLAGS} 332 # test_s_g_LDFLAGS = -static ${AM_LDFLAGS} 333 334 # test_d_g_SOURCES = $(TESTSSOURCES) 335 # test_d_g_CFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long -fomit-frame-pointer 336 # #ftmpl_inst.o 337 # test_d_g_LDADD = -lfactory $(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(TESTADDLIBDEBUG) 338 339 test_d_r_SOURCES = $(TESTSSOURCES) 340 # test_d_r_CFLAGS = -O3 -fomit-frame-pointer 341 #ftmpl_inst.o 342 test_d_r_LDADD = -lfactory $(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(TESTADDLIB) 343 344 test_d_r_LDFLAGS = ${AM_LDFLAGS} 345 # test_d_g_LDFLAGS = ${AM_LDFLAGS} 295 test_SOURCES = $(TESTSSOURCES) 296 test_LDADD = libfactory.la $(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(TESTADDLIB) -
kernel/Makefile.am
r17fe09 r667d33 2 2 # TODO: use ${top_srcdir} instead of .. in the above? 3 3 4 # PIPE = -pipe5 # ???6 #LD_DYN_FLAGS = -ldl -rdynamic7 #SFLAGS = -fpic -DPIC8 #SLDFLAGS = -shared9 #LD_LIBC = -lc10 #STATIC_LDFLAGS = -static11 4 12 5 13 # CXXTEMPLFLAGS =-ftrapv ## -fno-implicit-templates14 #15 # if WANT_DEBUG16 # LIB_G=libkernel_g.la17 # else18 # LIB_G=19 # endif20 21 6 libkernel_LTLIBRARIES = libkernel.la 22 # ${LIB_G}23 7 libkerneldir = $(libdir)/singular 24 8 25 #libkernel_la_CFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE}26 #libkernel_g_la_CFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE}27 ## -pedantic28 29 #libkernel_la_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)30 #libkernel_g_la_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)31 # -fdiagnostics-show-option32 33 9 AM_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) -DHAVE_CONFIG_H 34 35 # libkernel_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG36 # libkernel_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H37 38 ### libkernel_la_LDFLAGS = -release ${PACKAGE_VERSION}39 40 10 41 11 SOURCES = polys.cc febase.cc feread.cc \ … … 61 31 62 32 libkernel_la_SOURCES = $(SOURCES) 63 # libkernel_g_la_SOURCES = $(SOURCES)64 33 65 34 KERNELHEADERS = mod2.h polys.h hutil.h stairc.h ideals.h \ … … 97 66 TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}' 98 67 99 # if WANT_DEBUG 100 # TESTS = test-s-g test-s-r test-d-g test-d-r 101 # else 102 TESTS = test-s-r test-d-r 103 # endif 68 TESTS = test 69 104 70 check_PROGRAMS = $(TESTS) 105 71 106 # test_s_r_CFLAGS = -O3 -fomit-frame-pointer ${PIPE} 107 # test_s_g_CFLAGS = ${PIPE} 108 # 109 # test_s_r_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS) 110 # test_s_g_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS) 72 test_SOURCES = test.cc 73 test_LDADD = -lkernel -lpolys -lcoeffs -lreporter -lmisc \ 74 $(FACTORY_LIBS) -lomalloc -lresources $(NTL_LIBS) $(GMP_LIBS) \ 75 ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} 111 76 112 testsources = test.cc113 test_s_r_SOURCES = $(testsources)114 # test_s_g_SOURCES = $(testsources)115 116 test_s_r_LDADD = -lkernel -lpolys -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lresources $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}117 # test_s_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lresources_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}118 119 # test_s_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG120 # test_s_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H121 test_s_r_CPPFLAGS = ${AM_CPPFLAGS}122 123 test_s_r_LDFLAGS = -static ${AM_LDFLAGS}124 # test_s_g_LDFLAGS = -static ${AM_LDFLAGS}125 126 127 # test_d_r_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}128 # test_d_g_CFLAGS = ${PIPE}129 #130 # test_d_r_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)131 # test_d_g_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)132 133 test_d_r_SOURCES = $(testsources)134 # test_d_g_SOURCES = $(testsources)135 136 test_d_r_LDADD = -lkernel -lpolys -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lresources $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}137 # test_d_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lresources_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}138 139 # test_d_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG140 # test_d_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H141 test_d_r_CPPFLAGS = ${AM_CPPFLAGS}142 143 test_d_r_LDFLAGS = ${AM_LDFLAGS}144 # test_d_g_LDFLAGS = ${AM_LDFLAGS}145 77 146 78 # These files are built first -
libpolys/coeffs/Makefile.am
r17fe09 r667d33 1 1 ACLOCAL_AMFLAGS = -I ../../m4 2 3 # CXXTEMPLFLAGS =-ftrapv4 ## -fno-implicit-templates5 2 6 3 AM_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} -DHAVE_CONFIG_H 7 4 8 # if WANT_DEBUG9 # LIB_G=libcoeffs_g.la10 # else11 # LIB_G=12 # endif13 14 5 libcoeffs_LTLIBRARIES = libcoeffs.la 15 # ${LIB_G}16 6 libcoeffsdir = $(libdir)/singular 17 18 # libcoeffs_la_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}19 # libcoeffs_g_la_CFLAGS = ${PIPE}20 #21 # libcoeffs_la_CXXFLAGS = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS}22 # libcoeffs_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}23 # # -fdiagnostics-show-option24 #25 # libcoeffs_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG26 # libcoeffs_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H27 28 # libcoeffs_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H29 ### libcoeffs_la_LDFLAGS = -release ${PACKAGE_VERSION}30 31 7 32 8 # noinst_HEADERS= \ … … 43 19 44 20 libcoeffs_la_SOURCES = $(SOURCES) 45 # libcoeffs_g_la_SOURCES = $(SOURCES)46 21 47 22 libcoeffs_includedir =$(includedir)/singular/coeffs … … 49 24 bigintmat.h Enumerator.h AE.h OPAE.h AEp.h OPAEp.h AEQ.h OPAEQ.h 50 25 26 TESTS_ENVIRONMENT = SINGULARPATH='${top_srcdir}/../factory:${top_builddir}/../factory' 27 TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='$(top_builddir)' 51 28 52 ## for testing... 29 TESTS = test 30 31 check_PROGRAMS = $(TESTS) 32 53 33 if ENABLE_FACTORY 54 34 USE_FACTORY = -L${top_builddir}/../factory … … 59 39 AM_LDFLAGS = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${top_builddir}/../resources 60 40 61 TESTS_ENVIRONMENT = SINGULARPATH='${top_srcdir}/../factory:${top_builddir}/../factory' 62 TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='$(top_builddir)' 63 64 # if WANT_DEBUG 65 # TESTS = test_s_g test_s_r test_d_g test_d_r 66 # else 67 TESTS = test_s_r test_d_r 68 # endif 69 70 check_PROGRAMS = $(TESTS) 71 72 test_s_r_SOURCES = test.cc 73 # test_s_g_SOURCES = test.cc 74 75 test_d_r_SOURCES = test.cc 76 # test_d_g_SOURCES = test.cc 77 78 79 test_s_r_LDADD = -lcoeffs -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lresources ${NTL_LIBS} ${GMP_LIBS} 80 # test_s_g_LDADD = -lcoeffs_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lresources_g ${NTL_LIBS} ${GMP_LIBS} 81 82 test_d_r_LDADD = -lcoeffs -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lresources ${NTL_LIBS} ${GMP_LIBS} 83 # test_d_g_LDADD = -lcoeffs_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lresources_g ${NTL_LIBS} ${GMP_LIBS} 84 85 86 # test_s_r_CFLAGS = -O3 -fomit-frame-pointer ${PIPE} 87 # #test_s_g_CFLAGS = ${PIPE} 88 # 89 # test_d_r_CFLAGS = -O3 -fomit-frame-pointer ${PIPE} 90 # #test_d_g_CFLAGS = ${PIPE} 91 92 93 94 # test_s_r_CXXFLAGS = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS} 95 # # -fimplicit-templates 96 # test_s_g_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS} 97 # # -fimplicit-templates 98 # # -fdiagnostics-show-option 99 # test_d_r_CXXFLAGS = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS} 100 # test_d_g_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS} 101 102 103 104 # test_s_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG 105 # test_s_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H 106 # 107 # test_d_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG 108 # test_d_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H 109 # test_s_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H 110 # test_d_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H 111 112 113 test_s_r_LDFLAGS = -static ${AM_LDFLAGS} 114 # test_s_g_LDFLAGS = -static ${AM_LDFLAGS} 115 116 test_d_r_LDFLAGS = ${AM_LDFLAGS} 117 # test_d_g_LDFLAGS = ${AM_LDFLAGS} 41 test_SOURCES = test.cc 42 test_LDADD = -lcoeffs -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lresources ${NTL_LIBS} ${GMP_LIBS} -
libpolys/tests/Makefile.am
r17fe09 r667d33 1 1 ACLOCAL_AMFLAGS = -I ../../m4 2 3 # CXXTEMPLFLAGS =-ftrapv ## -O0 ## -fno-implicit-templates4 2 5 3 AM_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} -DHAVE_CONFIG_H 6 4 7 # if WANT_DEBUG8 # TESTS = simple_test \9 # coeffs_test_s_r coeffs_test_s_g coeffs_test_d_r coeffs_test_d_g \10 # polys_test_s_r polys_test_s_g polys_test_d_r polys_test_d_g \11 # rings_test_s_r rings_test_s_g rings_test_d_r rings_test_d_g12 # else13 5 TESTS = simple_test \ 14 coeffs_test_s_r coeffs_test_d_r \ 15 polys_test_s_r polys_test_d_r \ 16 rings_test_s_r rings_test_d_r 17 # endif 6 coeffs_test \ 7 polys_test \ 8 rings_test 18 9 19 10 check_PROGRAMS = $(TESTS) … … 21 12 nodist_simple_test_SOURCES = simple_test_runner.cpp 22 13 23 nodist_coeffs_test_s_r_SOURCES = coeffs_test_runner.cpp 24 nodist_polys_test_s_r_SOURCES = polys_test_runner.cpp 25 nodist_rings_test_s_r_SOURCES = rings_test_runner.cpp 26 27 # nodist_coeffs_test_s_g_SOURCES = coeffs_test_runner.cpp 28 # nodist_polys_test_s_g_SOURCES = polys_test_runner.cpp 29 # nodist_rings_test_s_g_SOURCES = rings_test_runner.cpp 30 31 32 nodist_coeffs_test_d_r_SOURCES = coeffs_test_runner.cpp 33 nodist_polys_test_d_r_SOURCES = polys_test_runner.cpp 34 nodist_rings_test_d_r_SOURCES = rings_test_runner.cpp 35 36 # nodist_coeffs_test_d_g_SOURCES = coeffs_test_runner.cpp 37 # nodist_polys_test_d_g_SOURCES = polys_test_runner.cpp 38 # nodist_rings_test_d_g_SOURCES = rings_test_runner.cpp 39 40 41 42 # RELEASECFLAGS = -O3 -fomit-frame-pointer ${PIPE} 43 # RELEASECXXFLAGS = -O3 -fomit-frame-pointer ${PIPE} 44 #RELEASECPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG 45 #RELEASECPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H 46 47 # coeffs_test_s_r_CFLAGS =${RELEASECFLAGS} 48 # polys_test_s_r_CFLAGS = ${RELEASECFLAGS} 49 # rings_test_s_r_CFLAGS = ${RELEASECFLAGS} 50 # 51 # coeffs_test_d_r_CFLAGS =${RELEASECFLAGS} 52 # polys_test_d_r_CFLAGS = ${RELEASECFLAGS} 53 # rings_test_d_r_CFLAGS = ${RELEASECFLAGS} 54 55 56 # coeffs_test_s_r_CXXFLAGS =${RELEASECXXFLAGS} 57 # polys_test_s_r_CXXFLAGS = ${RELEASECXXFLAGS} 58 # rings_test_s_r_CXXFLAGS = ${RELEASECXXFLAGS} 59 # 60 # coeffs_test_d_r_CXXFLAGS =${RELEASECXXFLAGS} 61 # polys_test_d_r_CXXFLAGS = ${RELEASECXXFLAGS} 62 # rings_test_d_r_CXXFLAGS = ${RELEASECXXFLAGS} 63 64 65 # coeffs_test_s_r_CPPFLAGS =${RELEASECPPFLAGS} 66 # polys_test_s_r_CPPFLAGS = ${RELEASECPPFLAGS} 67 # rings_test_s_r_CPPFLAGS = ${RELEASECPPFLAGS} 68 # 69 # coeffs_test_d_r_CPPFLAGS =${RELEASECPPFLAGS} 70 # polys_test_d_r_CPPFLAGS = ${RELEASECPPFLAGS} 71 # rings_test_d_r_CPPFLAGS = ${RELEASECPPFLAGS} 72 73 74 ### -pedantic 75 # DEBUGCFLAGS = $(AM_CFLAGS) -g -Wextra -Wall -Wno-long-long ${PIPE} 76 # DEBUGCXXFLAGS = $(AM_CXXFLAGS) ${DEBUGCFLAGS} ${CXXTEMPLFLAGS} 77 # DEBUGCPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H 78 # 79 # coeffs_test_s_g_CFLAGS =${DEBUGCFLAGS} 80 # polys_test_s_g_CFLAGS = ${DEBUGCFLAGS} 81 # rings_test_s_g_CFLAGS = ${DEBUGCFLAGS} 82 # 83 # coeffs_test_d_g_CFLAGS =${DEBUGCFLAGS} 84 # polys_test_d_g_CFLAGS = ${DEBUGCFLAGS} 85 # rings_test_d_g_CFLAGS = ${DEBUGCFLAGS} 86 # 87 # coeffs_test_s_g_CXXFLAGS =${DEBUGCXXFLAGS} 88 # polys_test_s_g_CXXFLAGS = ${DEBUGCXXFLAGS} 89 # rings_test_s_g_CXXFLAGS = ${DEBUGCXXFLAGS} 90 # 91 # coeffs_test_d_g_CXXFLAGS =${DEBUGCXXFLAGS} 92 # polys_test_d_g_CXXFLAGS = ${DEBUGCXXFLAGS} 93 # rings_test_d_g_CXXFLAGS = ${DEBUGCXXFLAGS} 94 # 95 # coeffs_test_d_g_CPPFLAGS =${DEBUGCPPFLAGS} 96 # polys_test_d_g_CPPFLAGS = ${DEBUGCPPFLAGS} 97 # rings_test_d_g_CPPFLAGS = ${DEBUGCPPFLAGS} 98 # 99 # coeffs_test_s_g_CPPFLAGS =${DEBUGCPPFLAGS} 100 # polys_test_s_g_CPPFLAGS = ${DEBUGCPPFLAGS} 101 # rings_test_s_g_CPPFLAGS = ${DEBUGCPPFLAGS} 102 14 nodist_coeffs_test_SOURCES = coeffs_test_runner.cpp 15 nodist_polys_test_SOURCES = polys_test_runner.cpp 16 nodist_rings_test_SOURCES = rings_test_runner.cpp 103 17 104 18 if ENABLE_FACTORY … … 110 24 AM_LDFLAGS = -L${top_builddir}/polys -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${top_builddir}/../resources 111 25 26 polys_test_LDFLAGS = ${AM_LDFLAGS} ${USEPPROCSDYNAMICLDFLAGS} 27 rings_test_LDFLAGS = $(polys_test_LDFLAGS) 112 28 113 coeffs_test_s_r_LDFLAGS = ${AM_LDFLAGS} -static 114 # coeffs_test_s_g_LDFLAGS = ${AM_LDFLAGS} -static 115 116 117 polys_test_s_r_LDFLAGS = ${AM_LDFLAGS} ${USEPPROCSDYNAMICLDFLAGS} -static 118 rings_test_s_r_LDFLAGS = $(polys_test_s_r_LDFLAGS) 119 120 # polys_test_s_g_LDFLAGS = ${AM_LDFLAGS} ${USEPPROCSDYNAMICLDFLAGS} -static 121 # rings_test_s_g_LDFLAGS = $(polys_test_s_g_LDFLAGS) 122 123 polys_test_d_r_LDFLAGS = ${AM_LDFLAGS} ${USEPPROCSDYNAMICLDFLAGS} 124 rings_test_d_r_LDFLAGS = $(polys_test_d_r_LDFLAGS) 125 126 # polys_test_d_g_LDFLAGS = ${AM_LDFLAGS} ${USEPPROCSDYNAMICLDFLAGS} 127 # rings_test_d_g_LDFLAGS = $(polys_test_d_g_LDFLAGS) 128 129 130 coeffs_test_s_r_LDADD = -lcoeffs -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lresources ${NTL_LIBS} ${GMP_LIBS} 131 polys_test_s_r_LDADD = -lpolys -lcoeffs -lreporter -lmisc ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc -lresources ${NTL_LIBS} ${GMP_LIBS} 132 rings_test_s_r_LDADD = $(polys_test_s_r_LDADD) 133 134 # coeffs_test_s_g_LDADD = -lcoeffs_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lresources_g ${NTL_LIBS} ${GMP_LIBS} 135 # polys_test_s_g_LDADD = -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc_g -lresources_g ${NTL_LIBS} ${GMP_LIBS} 136 # rings_test_s_g_LDADD = $(polys_test_s_g_LDADD) 137 138 coeffs_test_d_r_LDADD = -lcoeffs -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lresources ${NTL_LIBS} ${GMP_LIBS} 139 polys_test_d_r_LDADD = -lpolys -lcoeffs -lreporter -lmisc ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc -lresources ${NTL_LIBS} ${GMP_LIBS} 140 rings_test_d_r_LDADD = $(polys_test_d_r_LDADD) 141 142 # coeffs_test_d_g_LDADD = -lcoeffs_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lresources_g ${NTL_LIBS} ${GMP_LIBS} 143 # polys_test_d_g_LDADD = -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc_g -lresources_g ${NTL_LIBS} ${GMP_LIBS} 144 # rings_test_d_g_LDADD = $(polys_test_d_g_LDADD) 145 146 147 148 149 29 coeffs_test_LDADD = -lcoeffs -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lresources ${NTL_LIBS} ${GMP_LIBS} 30 polys_test_LDADD = -lpolys ${USEPPROCSDYNAMICLD} $(coeffs_test_LDADD) 31 rings_test_LDADD = $(polys_test_LDADD) 150 32 151 33 -
omalloc/Makefile.am
r17fe09 r667d33 1 1 ACLOCAL_AMFLAGS = -I ../m4 2 2 3 4 3 lib_LTLIBRARIES=libomalloc.la 5 # libomalloc_g.la6 7 #if WANT_DEBUG8 ## lib_LTLIBRARIES+=9 #endif10 4 11 5 libomalloc_includedir=$(includedir)/omalloc … … 36 30 37 31 libomalloc_la_SOURCES=$(SOURCES) $(noinst_HEADERS) 38 # libomalloc_g_la_SOURCES=$(SOURCES) $(noinst_HEADERS)39 40 32 41 33 # libomalloc_la_LDFLAGS = -release ${PACKAGE_VERSION} … … 43 35 44 36 nodist_libomalloc_la_SOURCES = omTables.inc omTables.h mylimits.h 45 # nodist_libomalloc_g_la_SOURCES = omTables.inc omTables.h mylimits.h46 47 37 nodist_libomalloc_include_HEADERS = omConfig.h mylimits.h omTables.h 48 38 … … 51 41 52 42 libomalloc_la_CPPFLAGS = ${AM_CPPFLAGS} -DOM_ALLOC_INTERNAL 53 # libomalloc_g_la_CPPFLAGS= ${AM_CPPFLAGS} -DOM_ALLOC_INTERNAL -DHAVE_CONFIG_H54 43 55 44 BUILT_SOURCES = omTables.inc omTables.h … … 70 59 #################################################### 71 60 ## Test program 72 ##73 # AM_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc74 61 75 TESTS = omtTest-s-m omtTest-d-m 76 # omtTest-d-g omtTest-s-g 77 78 #if WANT_DEBUG 79 ## TESTS+= 80 #endif 62 TESTS = omtTest-m omtTest-r 81 63 82 64 check_PROGRAMS = $(TESTS) 83 65 84 85 EXTRA_PROGRAMS = omtTest-s-r omtTest-d-r 86 #### tests fail: omtTest-s-r omtTest-d-r due to 87 # !!!expect omError_UnalignedAddr 88 # ***omError_UnalignedAddr: addr is unaligned 89 # occured at: ../../omalloc/omtTestError.c:260 90 # occured for (invalid) addr: 0x7fc5c3602811 (error=14) 91 # +++ok omError_UnalignedAddr 92 # 93 # !!!expect omError_NullSizeAlloc 94 # 2669 Segmentation fault 66 # EXTRA_PROGRAMS = omtTest-r 95 67 96 68 OMTTESTSSOURCES = omtTestReal.c omtTestDebug.c omtTestKeep.c omtTestError.c omtTest.c 97 69 98 # omtTest_s_g_SOURCES = $(OMTTESTSSOURCES) 99 # # omtTest_s_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H 100 # # omtTest_s_g_CFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} 101 # omtTest_s_g_LDADD = libomalloc.la 102 # omtTest_s_g_LDFLAGS = -L${builddir} -static 70 omtTest_m_CPPFLAGS = ${AM_CPPFLAGS} -DOM_TEST_MALLOC 71 omtTest_m_SOURCES = $(OMTTESTSSOURCES) 72 omtTest_m_LDADD = libomalloc.la 103 73 104 omtTest_s_m_CPPFLAGS = ${AM_CPPFLAGS} -DOM_TEST_MALLOC 105 omtTest_s_m_SOURCES = $(OMTTESTSSOURCES) 106 omtTest_s_m_LDADD = libomalloc.la 107 omtTest_s_m_LDFLAGS = -L${builddir} -static 74 omtTest_r_SOURCES = $(OMTTESTSSOURCES) 75 omtTest_r_LDADD = libomalloc.la 108 76 109 omtTest_s_r_SOURCES = $(OMTTESTSSOURCES)110 omtTest_s_r_CPPFLAGS = ${AM_CPPFLAGS}111 # omtTest_s_r_CFLAGS = -O3 ${PIPE}112 omtTest_s_r_LDADD = libomalloc.la113 omtTest_s_r_LDFLAGS = -L${builddir} -static114 115 116 117 # omtTest_d_g_SOURCES = $(OMTTESTSSOURCES)118 # # omtTest_d_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H119 # # omtTest_d_g_CFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE}120 # omtTest_d_g_LDADD = libomalloc.la121 # omtTest_d_g_LDFLAGS = -L${builddir}122 123 omtTest_d_m_CPPFLAGS = ${AM_CPPFLAGS} -DOM_TEST_MALLOC124 omtTest_d_m_SOURCES = $(OMTTESTSSOURCES)125 omtTest_d_m_LDADD = libomalloc.la126 omtTest_d_m_LDFLAGS = -L${builddir}127 128 omtTest_d_r_SOURCES = $(OMTTESTSSOURCES)129 omtTest_d_r_CPPFLAGS = ${AM_CPPFLAGS} -DOM_NDEBUG130 # omtTest_d_r_CFLAGS = -O3 ${PIPE}131 omtTest_d_r_LDADD = libomalloc.la132 omtTest_d_r_LDFLAGS = -L${builddir}
Note: See TracChangeset
for help on using the changeset viewer.
