Changeset 69ad7e in git

Timestamp:

Sep 26, 2011, 6:59:29 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

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:

• Makefile.am (modified) (5 diffs)
• feOptGen.h (modified) (1 diff)

Singular/Makefile.am

@@ -195 +195 @@
 AM_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
 
-EXTRA_PROGRAMS=feOpt gentable2 gentable1 feOptES feOptTS
-
-#mpsr_Tok.cc: mpsr_Tok.inc
-#iparith.cc: iparith.inc
-#cntrlc.cc: feOpt.inc
-#misc_ip.cc: feOpt.inc
-## test.cc: iparith.inc
-
+EXTRA_PROGRAMS=gentable2 gentable1 feOpt feOptES feOptTS
 
 gentable2_SOURCES = gentable2.cc grammar.h tok.h table.h
@@ -219 +212 @@
 # plural_cmd.inc: iparith.inc                          
                                  
-feOpt_SOURCES = feOpt.cc
-# feOpt_LDADD = -lSingular -lnumeric -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
-feOpt_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
+feOpt_SOURCES = feOptGen.cc feOptGen.h
 feOpt_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
-feOpt_CPPFLAGS = -DNDEBUG -DOM_NDEBUG -DGENERATE_OPTION_INDEX
-
-
-feOptES_SOURCES = feOpt.cc
-# feOptES_LDADD = -lSingular -lnumeric -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
-feOptES_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
+feOpt_CPPFLAGS = -DNDEBUG -DOM_NDEBUG
+
+feOptES_SOURCES = feOptGen.cc feOptGen.h
 feOptES_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
-feOptES_CPPFLAGS = -DNDEBUG -DOM_NDEBUG -DGENERATE_OPTION_INDEX -DESINGULAR 
-
-
-feOptTS_SOURCES = feOpt.cc
-# feOptES_LDADD = -lSingular -lnumeric -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
-feOptTS_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
+feOptES_CPPFLAGS = -DNDEBUG -DOM_NDEBUG -DESINGULAR 
+
+feOptTS_SOURCES = feOptGen.cc feOptGen.h
 feOptTS_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
-feOptTS_CPPFLAGS = -DNDEBUG -DOM_NDEBUG -DGENERATE_OPTION_INDEX -DTSINGULAR
-
+feOptTS_CPPFLAGS = -DNDEBUG -DOM_NDEBUG -DTSINGULAR
 
 ########################### Singular* #########################
@@ -244 +228 @@
 bin_PROGRAMS = Singular Singularg
 
-## Singular: libSingular.a
-## Singularg: libSingular_g.a
-
 Singular_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
-Singularg_CFLAGS = ${PIPE}
+Singularg_CFLAGS = -g ${PIPE}
 
 Singular_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
@@ -279 +260 @@
 testg_SOURCES = test.cc
 
-## testr: libSingular.a
-## testg: libSingular_g.a
-
 testr_LDADD = libSingular.a -lnumeric -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
 testg_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}
@@ -295 +273 @@
 #########################################################
 
+#mpsr_Tok.cc: mpsr_Tok.inc
+#iparith.cc: iparith.inc
+#cntrlc.cc: feOpt.inc
+#misc_ip.cc: feOpt.inc
 
 feOpt.inc: feOpt

Singular/feOptGen.h

@@ -13 +13 @@
 extern const char SHORT_OPTS_STRING[];
 
-#include <Singular/FeOptTab.h>
+#include <Singular/feOptTab.h>
 typedef enum {FE_OPT_UNDEF}  feOptIndex;