Changeset 989d6b in git
- Timestamp:
- Nov 15, 2013, 5:14:24 PM (10 years ago)
- Branches:
- (u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
- Children:
- 96e5c4f9a69fb4672f596992345c4a36008ea3c5
- Parents:
- bbeddf73180e5a0b82609d4054f2cf3d3de40a27
- git-author:
- Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-11-15 17:14:24+01:00
- git-committer:
- Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-11-15 17:17:40+01:00
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/Makefile.am
rbbeddf r989d6b 1 1 ACLOCAL_AMFLAGS = -I ../m4 2 2 3 # PIPE = -pipe4 # ???5 3 #LD_DYN_FLAGS = -ldl -rdynamic 4 #LD_LIBC = -lc 6 5 #SFLAGS = -fpic -DPIC 7 6 #SLDFLAGS = -shared 8 #LD_LIBC = -lc9 7 #STATIC_LDFLAGS = -static 10 8 11 9 # WARNCFLAGS = -Wunused-parameter 12 10 # clang has also: -Wunneeded-internal-declaration 13 14 # NODEBUGCFLAGS = -O3 -w -fomit-frame-pointer $(WARNCFLAGS)15 # NODEBUGCXXFLAGS = -O3 -w -fomit-frame-pointer $(WARNCFLAGS)16 # NODEBUGDEFS = -DNDEBUG -DOM_NDEBUG17 #18 11 19 12 GIT_VERSION := $(shell $(top_srcdir)/git-version-gen $(top_srcdir)/.tarball-git-version) … … 66 59 endif !SI_EMBED_PYTHON 67 60 68 # if WANT_DEBUG 69 # LIB_G=libSingular_g.la 70 # else 71 # LIB_G= 72 # endif 61 ########################### libSingular* ######################### 73 62 74 63 libSingular_LTLIBRARIES = libSingular.la 75 # ${LIB_G}76 64 libSingulardir = $(libdir)/singular 77 78 # libSingular_la_CFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(WARNCFLAGS)79 # libSingular_g_la_CFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(WARNCFLAGS)80 #81 # libSingular_la_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS) $(WARNCFLAGS)82 # libSingular_g_la_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS) $(WARNCFLAGS)83 # # -fdiagnostics-show-option84 85 86 # libSingular_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DLIBSINGULAR87 # libSingular_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DLIBSINGULAR88 65 89 66 libSingular_la_CPPFLAGS = ${AM_CPPFLAGS} -DLIBSINGULAR … … 148 125 149 126 libSingular_la_SOURCES = $(SOURCES) 150 # libSingular_g_la_SOURCES = $(SOURCES)151 127 152 128 SingularHEADERS = Cache.h \ … … 212 188 nodist_libSingular_la_SOURCES = feOpt.inc iparith.inc 213 189 214 # -release ${PACKAGE_VERSION}215 190 libSingular_la_LDFLAGS = ${AM_LDFLAGS} ${EMBED_PYOBJECT} \ 216 191 -lnumeric -lkernel -lpolys -lcoeffs -lreporter -lmisc \ … … 233 208 noinst_PROGRAMS = gentable1 feOptGen feOptES feOptTS 234 209 235 # CXXTEMPLFLAGS =-ftrapv ## -fno-implicit-templates236 237 210 gentable1_SOURCES = gentable.cc grammar.h tok.h table.h 238 # gentable1_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}239 # gentable1_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)240 211 gentable1_CPPFLAGS = ${AM_CPPFLAGS} 241 212 242 213 feOptGen_SOURCES = feOptGen.cc feOptGen.h 243 # feOptGen_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)244 214 feOptGen_CPPFLAGS = ${AM_CPPFLAGS} 245 215 246 216 feOptES_SOURCES = feOptGen.cc feOptGen.h 247 # feOptES_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)248 217 feOptES_CPPFLAGS = ${AM_CPPFLAGS} -DESINGULAR 249 218 250 219 feOptTS_SOURCES = feOptGen.cc feOptGen.h 251 # feOptTS_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)252 220 feOptTS_CPPFLAGS = ${AM_CPPFLAGS} -DTSINGULAR 253 221 … … 259 227 # script, and listed in an AC_SUBST macro 260 228 optional_Singular_programs = 261 # Singularg262 229 263 230 bin_PROGRAMS = Singular ESingular TSingular $(optional_Singular_programs) 264 231 265 # if WANT_DEBUG266 # bin_PROGRAMS += Singularg267 # EXTRA_PROGRAMS += Singulardg268 # endif269 270 232 Singular ESingular TSingular $(optional_Singular_programs): ${abs_builddir}/LIB 271 233 272 # Singular_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}273 # Singularg_CFLAGS = -g ${PIPE}274 #275 # Singular_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)276 # Singularg_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)277 278 234 nodist_Singular_SOURCES = libSingular.la 279 # nodist_Singularg_SOURCES = libSingular_g.la280 235 281 236 Singular_SOURCES = tesths.cc mmalloc.cc fegetopt.c fegetopt.h utils.cc utils.h 282 # Singularg_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc utils.h283 237 284 238 Singular_LDADD = libSingular.la ${EMBED_PYOBJECT} 285 239 286 240 Singular_LDFLAGS = -static ${AM_LDFLAGS} ${EMBED_PYOBJECT} 287 # Singularg_LDADD = libSingular_g.la ${top_builddir}/numeric/libnumeric_g.la ${top_builddir}/kernel/libkernel_g.la ${top_builddir}/libpolys/polys/libpolys_g.la -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lresources_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}288 289 # Singular_CPPFLAGS = ${AM_CPPFLAGS} -DGIT_VERSION='"$(GIT_VERSION)"'290 291 # Singularg_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H292 # Singular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H293 294 # Singularg_LDFLAGS = -static ${AM_LDFLAGS}295 296 297 # Singulard_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}298 # Singulardg_CFLAGS = -g ${PIPE}299 #300 # Singulard_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)301 # Singulardg_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)302 241 303 242 Singulard_SOURCES = tesths.cc mmalloc.cc fegetopt.c fegetopt.h utils.cc utils.h 304 243 nodist_Singulard_SOURCES = libSingular.la 305 244 306 # Singulardg_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc utils.h307 # nodist_Singulardg_SOURCES = libSingular_g.la308 309 245 # ${EMBED_PYOBJECT_LDFLAGS} ${EMBED_PYOBJECT_LDFLAGS} 310 246 Singulard_LDADD = libSingular.la ${EMBED_PYOBJECT} 311 # Singulardg_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lresources_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}312 313 # Singulard_CPPFLAGS = ${AM_CPPFLAGS} -DGIT_VERSION='"$(GIT_VERSION)"'314 315 # Singulard_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG316 # Singulardg_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H317 # Singulard_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H318 247 319 248 Singulard_LDFLAGS = ${AM_LDFLAGS} ${EMBED_PYOBJECT} … … 321 250 322 251 #### ESingular 323 324 # ESingular_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}325 # ESingular_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)326 #ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DESINGULAR -DPROTO327 252 ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DESINGULAR -DPROTO 328 253 ESingular_LDFLAGS = -static ${AM_LDFLAGS} … … 332 257 333 258 #### same for TSingular 334 335 # TSingular_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}336 # TSingular_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)337 #TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DTSINGULAR -DPROTO338 259 TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DTSINGULAR -DPROTO 339 260 TSingular_LDFLAGS = -static ${AM_LDFLAGS} … … 346 267 #### libparse 347 268 libparse_CPPFLAGS = ${AM_CPPFLAGS} -DSTANDALONE_PARSER 348 #libparse_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DSTANDALONE_PARSER349 # libparse_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}350 # libparse_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)351 269 352 270 libparse_SOURCES = libparse.cc fegetopt.c fegetopt.h utils.cc utils.h 353 # nodist_libparse_SOURCES = libSingular.la354 271 355 272 # # libSingular.la -lnumeric 356 273 libparse_LDADD = -lomalloc 357 274 libparse_LDFLAGS = -static ${AM_LDFLAGS} 358 # TODO for libparse: 275 # TODO for libparse: DONE by Hans??? 359 276 # multiple definition of `category_out': libparse.cc v.s. utils.cc 360 277 # undefined reference to `iiInitSingularProcinfo(procinfo*, char const*, char const*, int, long, int)' … … 371 288 LIB/help.cnf links/slInit_Dynamic.cc 372 289 373 # ${nobase_dist_singularlibrary_DATA}374 375 290 singularalllibrarydir = ${datadir}/singular/LIB 376 291 singularalllibrary = all.lib … … 381 296 382 297 ########################### TEST ######################### 383 384 298 TESTS_ENVIRONMENT = SINGULARPATH='${top_builddir}/Singular/LIB:${top_srcdir}/Singular/LIB:${top_builddir}/libpolys/polys/.libs:${top_builddir}/factory/gftables' 385 299 TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${top_builddir}' … … 387 301 TESTS=test-s-r test-d-r 388 302 389 # if WANT_DEBUG390 # TESTS += test-s-g test-d-g391 # endif392 393 303 check_PROGRAMS=$(TESTS) 394 304 395 305 # Static versions 396 397 # test_s_r_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}398 # test_s_g_CFLAGS = ${PIPE}399 #400 # test_s_r_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)401 # test_s_g_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)402 403 306 test_s_r_SOURCES = test.cc 404 #test_s_g_SOURCES = test.cc405 307 # ${EMBED_PYOBJECT_LDFLAGS} 406 308 test_s_r_LDADD = libSingular.la 407 309 408 #-lnumeric -lkernel -lpolys -lcoeffs \409 # -lreporter -lmisc$(FACTORY_LIBS) -lomalloc -lresources $(FLINT_LIBS) \410 # $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} \310 #-lnumeric -lkernel -lpolys -lcoeffs -lreporter -lmisc \ 311 # $(FACTORY_LIBS) -lomalloc -lresources $(FLINT_LIBS) \ 312 # $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} \ 411 313 #${EMBED_PYOBJECT} 412 413 #test_s_g_LDADD = libSingular_g.la 414 #-lnumeric_g -lkernel_g -lpolys_g \ 415 #-lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g \ 416 #-lresources_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) \ 417 #${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} \ 418 #${EMBED_PYOBJECT} 419 420 421 # test_s_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H 422 #test_s_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG 423 #test_s_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H 314 #${EMBED_PYOBJECT_LDFLAGS} 424 315 425 316 test_s_r_LDFLAGS = -static ${AM_LDFLAGS} 426 #test_s_g_LDFLAGS = -static ${AM_LDFLAGS}427 428 317 429 318 # Dynamic versions 430 431 # test_d_r_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}432 # test_d_g_CFLAGS = ${PIPE}433 #434 # test_d_r_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)435 # test_d_g_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)436 437 319 test_d_r_SOURCES = test.cc 438 # test_d_g_SOURCES = test.cc439 # ${EMBED_PYOBJECT_LDFLAGS}440 320 test_d_r_LDADD = libSingular.la 441 # -lnumeric -lkernel -lpolys -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lresources $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}442 # test_d_g_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lresources_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}443 444 #test_d_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG445 # test_d_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H446 # test_d_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H447 448 #test_d_r_LDFLAGS = ${AM_LDFLAGS}449 # test_d_g_LDFLAGS = ${AM_LDFLAGS}450 321 451 322 ######################################################### … … 477 348 # plural_cmd.inc: iparith.inc 478 349 479 480 350 gftables: ${top_srcdir}/factory/gftables 481 351 ln -snf ${top_srcdir}/factory/gftables ${builddir}/gftables -
Singular/iplib.cc
rbbeddf r989d6b 733 733 } 734 734 735 int staticdemo_mod_init(SModulFunctions*){ PrintS("init of staticdemo\n"); return (0); }735 int SI_MOD_INIT(staticdemo)(SModulFunctions*){ PrintS("init of staticdemo\n"); return (0); } 736 736 737 737 #define SI_GET_BUILTIN_MOD_INIT(name) \ 738 int SI_MOD_INIT(name)(SModulFunctions*); \ 739 if (strcmp(libname, #name ".so") == 0) { return SI_MOD_INIT(name); } 740 738 if (strcmp(libname, #name ".so") == 0){ int SI_MOD_INIT(name)(SModulFunctions*); return SI_MOD_INIT(name); } 741 739 742 740 SModulFunc_t -
Singular/singmathic.cc
rbbeddf r989d6b 551 551 setRingGlobal 552 552 ); 553 return 1;553 return 0; 554 554 } 555 555 … … 563 563 "for MathicGB." 564 564 ); 565 return 0;565 return 1; 566 566 } 567 567 -
dyn_modules/syzextra/Makefile.am
rbbeddf r989d6b 1 1 ACLOCAL_AMFLAGS = -I ../../m4 2 2 3 if ENABLE_P_PROCS_DYNAMIC 4 moduledir = $(libexecdir)/singular/MOD 5 else 6 moduledir = $(libdir)/singular 7 endif 8 9 10 module_LTLIBRARIES=syzextra.la 11 12 #if ENABLE_P_PROCS_DYNAMIC 13 # if WANT_DEBUG 14 # module_LTLIBRARIES+=syzextra_g.la 15 # endif 16 #endif 17 18 if ENABLE_FACTORY 19 USE_FACTORY = -L${top_builddir}/factory 20 else 21 USE_FACTORY = 22 endif 23 24 # CXXTEMPLFLAGS = ${PIPE} 25 # ## -fno-implicit-templates 26 # 27 # DEBUGCXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${CXXTEMPLFLAGS} 28 # 29 # NODEBUGCFLAGS = -O3 -w -fomit-frame-pointer ${PIPE} 30 # NODEBUGCXXFLAGS = -O3 -w -fomit-frame-pointer ${CXXTEMPLFLAGS} -fno-rtti -fno-exceptions 31 # 32 # NODEBUGDEFS = -DNDEBUG -DOM_NDEBUG 33 34 # -DHAVE_CONFIG_H?? 3 SOURCES = mod_main.cc DebugPrint.cc DebugPrint.h myNF.cc myNF.h singularxx_defs.h 35 4 36 5 MYINCLUDES = -I${top_srcdir} -I${top_builddir} -I${srcdir} \ … … 39 8 $(FACTORY_CFLAGS) $(NTL_CFLAGS) $(GMP_CFLAGS) 40 9 10 AM_LDFLAGS = ${GOOGLE_PERFTOOL_LDFLAGS} 41 11 42 AM_LDFLAGS = ${GOOGLE_PERFTOOL_LDFLAGS} 43 # -release ${PACKAGE_VERSION} 12 module_LTLIBRARIES=syzextra.la 44 13 45 # -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel \ 46 # -L${top_builddir}/libpolys/polys $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/resources 14 if ENABLE_P_PROCS_DYNAMIC 15 moduledir = $(libexecdir)/singular/MOD 16 P_PROCS_CPPFLAGS_COMMON = -DDYNAMIC_VERSION 17 # Add under Mac OS X: -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup 18 else 19 moduledir = $(libdir)/singular 20 P_PROCS_CPPFLAGS_COMMON = -DSTATIC_VERSION 21 endif 47 22 23 P_PROCS_MODULE_LDFLAGS = -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup 48 24 49 SOURCES = mod_main.cc DebugPrint.cc DebugPrint.h myNF.cc myNF.h singularxx_defs.h50 25 syzextra_la_SOURCES = $(SOURCES) 51 # syzextra_g_la_SOURCES = $(SOURCES) 52 53 54 P_PROCS_CPPFLAGS_COMMON = -DDYNAMIC_VERSION 55 56 syzextra_la_CPPFLAGS = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON} 57 # ${NODEBUGDEFS} 58 # syzextra_g_la_CPPFLAGS = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON} 59 60 syzextra_la_CXXFLAGS = 61 # ${NODEBUGCXXFLAGS} 62 #syzextra_g_la_CXXFLAGS = ${DEBUGCXXFLAGS} 63 64 P_PROCS_MODULE_LDFLAGS = ${AM_LDFLAGS} -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup 65 # Add under Mac OS X: -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup 66 67 syzextra_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS} 26 syzextra_la_CPPFLAGS = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON} 27 syzextra_la_LDFLAGS = ${AM_LDFLAGS} ${P_PROCS_MODULE_LDFLAGS} 68 28 69 29 # AM_COLOR_TESTS=always
Note: See TracChangeset
for help on using the changeset viewer.