Changeset 69ad7e in git


Ignore:
Timestamp:
Sep 26, 2011, 6:59:29 PM (13 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '3a4bc649f1d0185cc9f8b122bd75f21f75ac9c9a')
Children:
f16c61cbb635c326db5e37a9292edf4969b843a2
Parents:
a8b8d033cc77dede263d1c2b1ce1c838cc69ce74
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-26 18:59:29+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:13:35+01:00
Message:
FIX: feOpt.inc - issue should be fixed with this!
Location:
Singular
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Singular/Makefile.am

    ra8b8d03 r69ad7e  
    195195AM_LDFLAGS = -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel -L${top_builddir}/libpolys/polys -L${top_builddir}/libpolys/coeffs -L${top_builddir}/libpolys/reporter -L${top_builddir}/libpolys/resources -L${top_builddir}/libpolys/misc $(USE_FACTORY) -L${top_builddir}/omalloc
    196196
    197 EXTRA_PROGRAMS=feOpt gentable2 gentable1 feOptES feOptTS
    198 
    199 #mpsr_Tok.cc: mpsr_Tok.inc
    200 #iparith.cc: iparith.inc
    201 #cntrlc.cc: feOpt.inc
    202 #misc_ip.cc: feOpt.inc
    203 ## test.cc: iparith.inc
    204 
     197EXTRA_PROGRAMS=gentable2 gentable1 feOpt feOptES feOptTS
    205198
    206199gentable2_SOURCES = gentable2.cc grammar.h tok.h table.h
     
    219212# plural_cmd.inc: iparith.inc                         
    220213                                 
    221 feOpt_SOURCES = feOpt.cc
    222 # feOpt_LDADD = -lSingular -lnumeric -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    223 feOpt_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
     214feOpt_SOURCES = feOptGen.cc feOptGen.h
    224215feOpt_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    225 feOpt_CPPFLAGS = -DNDEBUG -DOM_NDEBUG -DGENERATE_OPTION_INDEX
    226 
    227 
    228 feOptES_SOURCES = feOpt.cc
    229 # feOptES_LDADD = -lSingular -lnumeric -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    230 feOptES_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
     216feOpt_CPPFLAGS = -DNDEBUG -DOM_NDEBUG
     217
     218feOptES_SOURCES = feOptGen.cc feOptGen.h
    231219feOptES_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    232 feOptES_CPPFLAGS = -DNDEBUG -DOM_NDEBUG -DGENERATE_OPTION_INDEX -DESINGULAR
    233 
    234 
    235 feOptTS_SOURCES = feOpt.cc
    236 # feOptES_LDADD = -lSingular -lnumeric -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    237 feOptTS_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
     220feOptES_CPPFLAGS = -DNDEBUG -DOM_NDEBUG -DESINGULAR
     221
     222feOptTS_SOURCES = feOptGen.cc feOptGen.h
    238223feOptTS_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    239 feOptTS_CPPFLAGS = -DNDEBUG -DOM_NDEBUG -DGENERATE_OPTION_INDEX -DTSINGULAR
    240 
     224feOptTS_CPPFLAGS = -DNDEBUG -DOM_NDEBUG -DTSINGULAR
    241225
    242226########################### Singular* #########################
     
    244228bin_PROGRAMS = Singular Singularg
    245229
    246 ## Singular: libSingular.a
    247 ## Singularg: libSingular_g.a
    248 
    249230Singular_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    250 Singularg_CFLAGS = ${PIPE}
     231Singularg_CFLAGS = -g ${PIPE}
    251232
    252233Singular_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
     
    279260testg_SOURCES = test.cc
    280261
    281 ## testr: libSingular.a
    282 ## testg: libSingular_g.a
    283 
    284262testr_LDADD = libSingular.a -lnumeric -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    285263testg_LDADD = libSingular_g.a -lnumeric_g -lkernel_g -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
     
    295273#########################################################
    296274
     275#mpsr_Tok.cc: mpsr_Tok.inc
     276#iparith.cc: iparith.inc
     277#cntrlc.cc: feOpt.inc
     278#misc_ip.cc: feOpt.inc
    297279
    298280feOpt.inc: feOpt
  • Singular/feOptGen.h

    ra8b8d03 r69ad7e  
    1313extern const char SHORT_OPTS_STRING[];
    1414
    15 #include <Singular/FeOptTab.h>
     15#include <Singular/feOptTab.h>
    1616typedef enum {FE_OPT_UNDEF}  feOptIndex;
    1717
Note: See TracChangeset for help on using the changeset viewer.