Changeset 6b71e2 in git

Timestamp:

Aug 4, 2011, 2:31:53 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

88ece17732096cebe2ea956dab2edbeaad8852ee

Parents:

cb1a064253f682f7f732247406eb939b566c1b61

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-04 14:31:53+02:00

git-committer:

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

Message:

ADD: "make check" tries to link test and test-g now!

File:

• kernel/makefile (modified) (2 diffs)

kernel/makefile

@@ -36 +36 @@
 ##
 LIBPOLYS_CFLAGS = -I.. -I../libpolys
-LIBPOLYS_LIBS   = -L../factory -L../omalloc -L../libpolys/misc -L../libpolys/reporter -L../libpolys/resources -L../libpolys/coeffs -L../libpolys/polys -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g -lfactory -lomalloc_g
+LIBPOLYS_LIBS   = -L../factory -L../omalloc -L../libpolys/misc -L../libpolys/reporter -L../libpolys/resources -L../libpolys/coeffs -L../libpolys/polys -lpolys -lcoeffs -lresources -lreporter -lmisc -lfactory -lomalloc
+LIBPOLYS_LIBSG   = -L../factory -L../omalloc -L../libpolys/misc -L../libpolys/reporter -L../libpolys/resources -L../libpolys/coeffs -L../libpolys/polys -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g -lfactory -lomalloc_g
 
 PIPE            = -pipe
@@ -301 +302 @@
 
 
+test.og: test.cc mod2.h libkernel_g.a  
+        $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSG} -c $< -o $@ 
+
 test.o: test.cc mod2.h libkernel_g.a  
-        $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSG} -c $< -o $@ 
-
+        $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} -c $< -o $@ 
+
+
+test-g: test.og
+        $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSG} $< -o $@ -L. -lkernel_g ${LIBPOLYS_LIBSG} -lntl -ldl -lgmp
+
+test: test.o
+        $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} $< -o $@ -L. -lkernel ${LIBPOLYS_LIBS} -lntl -ldl -lgmp
 
 # My headers test
-check: test.o
-        $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSG} $< -o test -L. -lkernel_g ${LIBPOLYS_LIBS} -lntl -ldl -lgmp
+check: test test-g