Changeset 3449431 in git

Timestamp:

Aug 31, 2011, 2:18:56 AM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

13a8deb045504711d73aa092f40117737cc315a2

Parents:

4a4e294c1281857cdf5d91f50cfa1c1f222226b1

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-31 02:18:56+02:00

git-committer:

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

Message:

FIX: tesths.cc should be compiled without -DLIBSINGULAR!

File:

• Singular/makefile (modified) (5 diffs)

Singular/makefile

@@ -53 +53 @@
 CXXTEMPLFLAGS   = -fno-implicit-templates --no-exceptions
 CPPFLAGS        = -I${srcdir} -I..  -I${includedir} ${LIBPOLYS_INCLUDES}  ${PYTHON_INCLUDES}
-DEFS            = -DNDEBUG -DOM_NDEBUG -DLIBSINGULAR
+DEFSNL          = -DNDEBUG -DOM_NDEBUG
+DEFS            = ${DEFSNL} -DLIBSINGULAR
 LDFLAGS         = -L${srcdir}/lib 
 LD_DYN_FLAGS    = -ldl -rdynamic
@@ -225 +226 @@
 all: libSingular_g.a libSingular.a Singular Singularg 
 
+tesths.og: %.og: %.cc
+        $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSGNL} -c $< -o $@
+        
+tesths.o: %.o: %.cc
+        $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSNL} -c $< -o $@
+
 Singular: tesths.o libSingular.a
         $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} tesths.o -o $@ -L. -lSingular -L../kernel -lkernel ${LIBPOLYS_LIBS}
@@ -256 +263 @@
         @echo "bison, perl and autoconf"
 
-#dep.
+#dep. ( manually?!! :((( )
 feOpt.h: feOpt.inc
-
+cntrlc.cc: feOpt.inc
+iparith.cc: iparith.inc
 misc_ip.cc: feOpt.h
 
@@ -267 +275 @@
 
 
-iparith.o :iparith.inc
-
 ##
 ## miscellanous targets
@@ -300 +306 @@
 CCM             = gcc -MM -MG -DGENERATE_DEPEND
 
-DEFSG           =   -DLIBSINGULAR
+DEFSGNL         = 
+DEFSG           = ${DEFSGNL} -DLIBSINGULAR
 
 CFLAGSG         = -Wall ${PIPE} ${LIBPOLYS_CFLAGS} ${PYTHON_CFLAGS}