Changeset 4fc8028 in git

Timestamp:

Sep 24, 2011, 1:01:31 AM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

6179c1fcdd2c1b21e040bdac6db37f0b3e0128b9

Parents:

8679524adeabb49ec1b470bd043baa1099d7f64c

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-24 01:01:31+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:13:26+01:00

Message:

FIX: another try to fix feOpt.inc-issue...

File:

• Singular/makefile (modified) (6 diffs)

Singular/makefile

@@ -231 +231 @@
 OBJP := $(OBJP) $(STATIC_SOURCES:.cc=.op) 
 
-all: feOpt.inc libSingular_g.a libSingular.a Singular Singularg 
+all: feOpt.inc all1
+
+all1: feOpt.inc libSingular_g.a libSingular.a Singular Singularg 
 
 tesths.og: %.og: %.cc
@@ -239 +241 @@
         $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSNL} -c $< -o $@
 
-Singular: tesths.o libSingular.a
+Singular: feOpt.inc tesths.o libSingular.a
         $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} tesths.o -o $@ -L. -lSingular -L../kernel -lkernel -L../numeric -lnumeric ${LIBPOLYS_LIBS} ${LD_DYN_FLAGS}
 
-Singularg: tesths.og libSingular_g.a
+Singularg: feOpt.inc tesths.og libSingular_g.a
         $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGSG} ${CPPFLAGSG} ${DEFSG} tesths.og -o $@ -L. -lSingular_g -L../kernel -lkernel_g -L../numeric -lnumeric_g ${LIBPOLYS_LIBSG} ${LD_DYN_FLAGS}
 
@@ -272 +274 @@
 #dep. ( manually?!! :((( )
 
+feOpt.cc: feOpt.inc
 feOpt.h: feOpt.inc
 cntrlc.cc: feOpt.inc
-iparith.cc: iparith.inc
 misc_ip.cc: feOpt.inc
 test.cc: iparith.inc
+iparith.cc: iparith.inc
 
 mpsr_Tok.inc: gentable2.cc
@@ -390 +393 @@
 # test: test.o
 
-feOpt.inc: feOpt.cc
+feOpt.inc:
         $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX ${CPPFLAGS} feOpt.cc -o feOpt
         ./feOpt
         /bin/rm -f feOpt feOpt.exe
 
-feOptES.inc: feOpt.cc
+feOptES.inc:
         $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX ${CPPFLAGS} -DESINGULAR -I../kernel feOpt.cc -o feOptES
         ./feOptES
         rm -f feOptES feOptES.exe
 
-feOptTS.inc: feOpt.cc
+feOptTS.inc:
         $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX ${CPPFLAGS} -DTSINGULAR -I../kernel feOpt.cc -o feOptTS
         ./feOptTS
         rm -f feOptTS feOptTS.exe
 
-plural_cmd.inc: gentable.cc grammar.h tok.h table.h
+plural_cmd.inc: feOpt.inc gentable.cc grammar.h tok.h table.h
          ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} gentable.cc \
              -o gentable1
@@ -411 +414 @@
         /bin/rm -f gentable1 gentable1.exe
 
-iparith.inc: gentable.cc grammar.h tok.h table.h
+iparith.inc: feOpt.inc gentable.cc grammar.h tok.h table.h
          ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} gentable.cc \
              -o gentable1
@@ -429 +432 @@
 
 # My headers test
-check: feOpt.inc testg testr 
+check: feOpt.inc libSingular.a libSingular_g.a testg testr 
         SINGULAR_ROOT_DIR="${PWD}/../" SINGULARPATH="${PWD}/../libpolys/polys/.libs" ./testg
         SINGULAR_ROOT_DIR="${PWD}/../" SINGULARPATH="${PWD}/../libpolys/polys/.libs" ./testr