FIX: minor fixes due to feOpt.*

Author: Oleksandr Motsak

Singular/feOpt.cc

@@ -13,7 +13,7 @@
 #define SI_DONT_HAVE_GLOBAL_VARS
 #include <factory/factory.h>
 #endif
-#include <Singular/feOpt.h>
+#include "feOpt.h"
 #if !defined(GENERATE_OPTION_INDEX) && !defined(ESINGULAR) && !defined(TSINGULAR)
 #include <misc/options.h>
 #endif

Singular/makefile

@@ -239,6 +239,7 @@ mostlyclean:
 
 clean: mostlyclean
 	-rm -f *.bak *.d *.dd depend *.a *.so*
+	-rm feOpt.inc iparith.inc plural_cmd.inc
 
 distclean: clean
 	-rm -f *~ .\#* 
@@ -256,6 +257,7 @@ maintainer-clean: distclean srcclean
 
 #dep.
 feOpt.h: feOpt.inc
+
 misc_ip.cc: feOpt.h
 
 mpsr_Tok.inc: gentable2.cc
@@ -386,6 +388,12 @@ feOptTS.inc: feOpt.cc
 	./feOptTS
 	rm -f feOptTS feOptTS.exe
 
+plural_cmd.inc: gentable.cc grammar.h tok.h table.h
+	 ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} gentable.cc \
+	     -o gentable1
+	./gentable1
+	/bin/rm -f gentable1 gentable1.exe
+
 iparith.inc: gentable.cc grammar.h tok.h table.h
 	 ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} gentable.cc \
 	     -o gentable1

Singular/mpsr_sl.cc

@@ -28,7 +28,7 @@
 #include <Singular/ipid.h>
 #include <Singular/silink.h>
 #include <Singular/cntrlc.h>
-#include <Singular/feOpt.h>
+#include "feOpt.h"
 
 
 static int Batch_ReadEval(si_link silink);

Singular/tesths.cc

@@ -32,7 +32,7 @@
 #include <kernel/timer.h>
 #include <Singular/sdb.h>
 #include <kernel/fegetopt.h>
-#include <Singular/feOpt.h>
+#include "feOpt.h"
 #include <Singular/distrib.h>
 #include <Singular/version.h>
 #include <Singular/slInit.h>