Changeset 76944d in git

Timestamp:

Aug 10, 2011, 2:45:36 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

4a48c47615e94a3c63018715abea80de7e53d76a

Parents:

9b01b109e08780f8e6f510609056f70e9557663e

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-08-10 14:45:36+02:00

git-committer:

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

Message:

fixed dependencies of feOpt.inc

Location:

Singular

Files:

• makefile (modified) (4 diffs)
• misc_ip.cc (modified) (2 diffs)

Singular/makefile

@@ -230 +230 @@
 distclean: clean
         -rm -f *~ .\#* 
-        -rm -f mod2.h Makefile TAGS* tags config.status config.cache config.log
+        -rm -f Makefile TAGS* tags config.status config.cache config.log
 
 srcclean:
@@ -242 +242 @@
         @echo "bison, perl and autoconf"
 
+#dep.
+feOpt.h: feOpt.inc
+misc_ip.cc: feOpt.h
+
 ##
 ## miscellanous targets
@@ -336 +340 @@
 ##
 
-%.dd: %.cc mod2.h 
+%.dd: %.cc
         echo $(@:.dd=.og) $(@:.dd=.op) " " \\ > $@
         $(CXXM) -DGENTABLE ${CPPFLAGS} ${DEFSG} $< >> $@
 
-%.d: %.c mod2.h 
+%.d: %.c
         echo $(@:.d=.og) $(@:.d=.op) " " \\ > $@
         $(CCM) ${CPPFLAGS} ${DEFSG} $< >> $@
 
-depend:   $(CXXSOURCES:.cc=.dd) $(ESOURCES:.cc=.dd) $(CSOURCES:.c=.d) mod2.h
+depend:   $(CXXSOURCES:.cc=.dd) $(ESOURCES:.cc=.dd) $(CSOURCES:.c=.d)
         cat *.d *.dd >depend
 
@@ -355 +359 @@
 # test: test.o
 
-test.o: test.cc mod2.h feOpt.inc
+test.o: test.cc feOpt.inc
         $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSG} -c $< -o $@
 
-feOpt.inc: feOpt.cc mod2.h
+feOpt.inc: feOpt.cc
         $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX ${CPPFLAGS} feOpt.cc -o feOpt
         ./feOpt
         /bin/rm -f feOpt feOpt.exe
 
-feOptES.inc: feOpt.cc mod2.h
+feOptES.inc: feOpt.cc
         $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX ${CPPFLAGS} -DESINGULAR -I../kernel feOpt.cc -o feOptES
         ./feOptES
         rm -f feOptES feOptES.exe
 
-feOptTS.inc: feOpt.cc mod2.h
+feOptTS.inc: feOpt.cc
         $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX ${CPPFLAGS} -DTSINGULAR -I../kernel feOpt.cc -o feOptTS
         ./feOptTS
         rm -f feOptTS feOptTS.exe
 
-iparith.inc: gentable.cc grammar.h tok.h table.h mod2.h
+iparith.inc: gentable.cc grammar.h tok.h table.h
          ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} gentable.cc \
              -o gentable1

Singular/misc_ip.cc

@@ -357 +357 @@
 #include <polys/polys.h>
 #endif
-#include <Singular/version.h>
 
 #include <Singular/static.h>
@@ -837 +836 @@
 #endif
               StringAppend("random=%d\n",siRandomStart);
-              StringAppend("\tCC=%s,\n\tCXX=%s"
+//              StringAppend("\tCC=%s,\n\tCXX=%s"
 #ifdef __GNUC__
-              "(" __VERSION__ ")"
-#endif
-              "\n",CC,CXX);
+//              "(" __VERSION__ ")"
+#endif
+//              "\n",CC,CXX);
               feStringAppendResources(0);
               feStringAppendBrowsers(0);