Changeset b54a36e in git

Timestamp:

Aug 3, 2011, 8:56:41 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

ed82272d0e143c59b60e31b441961e2bbc3f3afd

Parents:

2c52441d528d3c9973ac9373c0325fe522bab68e

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-03 20:56:41+02:00

git-committer:

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

Message:

ADD: make should now also build libkernel*...
ADD: 'make check' in kernel/ will try to link against libpolys AND libkernel_g.a

Files:

• Makefile.am (modified) (1 diff)
• kernel/makefile (modified) (2 diffs)
• kernel/test.cc (modified) (10 diffs)
• standalone.test/test.cc (modified) (1 diff)

Makefile.am

@@ -8 +8 @@
 endif
  
-PACKAGES=$(ALLOC) $(USE_FACTORY) libpolys
+PACKAGES=$(ALLOC) $(USE_FACTORY) libpolys kernel
 
 SUBDIRS=$(PACKAGES)
 
-TESTDIRS=libpolys
+TESTDIRS=libpolys kernel

kernel/makefile

@@ -35 +35 @@
 ## compiler and linker options
 ##
-LIBPOLYS_CFLAGS = `sh ../libpolys/libpolys-config --cflags`
+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
 
 PIPE            = -pipe
@@ -300 +301 @@
 
 
+test.o: test.cc mod2.h libkernel_g.a  
+        $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSG} -c $< -o $@ 
+
+
 # My headers test
-# test: test.o
-
-test.o: test.cc mod2.h
-        $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSG} -c $< -o $@
+check: test.o
+        $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSG} $< -o test -L. -lkernel_g ${LIBPOLYS_LIBS} -lntl -ldl -lgmp

kernel/test.cc

@@ -1 +1 @@
 #include <omalloc/omalloc.h>
-
 #include <misc/auxiliary.h>
+
 #include <misc/intvec.h>
+#include <misc/int64vec.h>
 #include <misc/mylimits.h>
 #include <misc/options.h>
@@ -15 +16 @@
 #include <coeffs/si_gmp.h>
 
-#include <polys/clapconv.h>
-#include <polys/clapsing.h>
+/*
 #include <polys/kbuckets.h>
 #include <polys/matpol.h>
@@ -37 +37 @@
 #include <polys/nc/summator.h>
 
-#include <polys/operations/pShallowCopyDelete.h>
+//WRONG???/// #include <polys/operations/pShallowCopyDelete.h> // TODO!
 
 #include <polys/templates/p_MemAdd.h>
 #include <polys/templates/p_Procs.h>
 
+// #include <polys/clapconv.h> // factory?
+// #include <polys/clapsing.h>
+*/
+
+
+#ifdef HAVE_FACTORY
+int initializeGMP(){ return 1; } // NEEDED FOR MAIN APP. LINKING!!!
+#endif
+
+/*
 extern ring currRing;
-
-//#ifdef HAVE_FACTORY
-//int initializeGMP(){ return 1; } // NEEDED FOR MAIN APP. LINKING!!!
-//#endif
-
 
 #include <coeffs/numbers.h>
@@ -58 +63 @@
 
 #include "hutil.h"
-#include "idrec.h"
+//#include "idrec.h" // moved to Singular
 #include "stairc.h"
 #include "ideals.h"
 #include "structs.h"
-#include "int64vec.h"
 #include "syz.h"
 #include "fast_maps.h"
@@ -93 +97 @@
 #include "gfan.h"
 
-// #include "kutil.h" // ???
-
-
-/* ALL: */
+#include "kutil.h"
+
 
 // #include "CCRing.h" // Too old!
@@ -102 +104 @@
 #include "digitech.h"
 #include "eigenval.h"
-// #include "F4.h" // uses tgb_internal
-#include "F5cData.h"
+#include "F4.h" // uses tgb_internal
+//#include "F5cData.h"
 #include "f5c.h"
-#include "F5cLists.h"
+//#include "F5cLists.h"
 #include "f5data.h"
 #include "f5gb.h"
@@ -122 +124 @@
 // #include "Ideal.h" // Too old?
 #include "ideals.h"
-#include "idrec.h"
 #include "IIntvec.h"
-#include "int64vec.h"
 #include "khstd.h"
 #include "kmatrix.h"
@@ -154 +154 @@
 #include "tgbgauss.h"
 #include "tgb.h"
-// #include "tgb_internal.h" // uses kutil :(
+#include "tgb_internal.h" // uses kutil :(
 #include "timer.h"
 #include "units.h"
@@ -161 +161 @@
 #include "walkSupport.h"
 
-/* */
-
-
+*/
 
 
 // Sources:
-
+/*
 #include "febase.cc"
 #include "feread.cc"
@@ -291 +289 @@
 #include "walkProc.cc"
 #include "walkSupport.cc"
+*/
+
+
+
+int main( int, char *argv[] ) 
+{
+  feInitResources(argv[0]);
+
+  StringSetS("ressources in use (as reported by feStringAppendResources(0):\n");
+  feStringAppendResources(0);
+  PrintS(StringAppendS("\n"));
+   
+  return 0;
+}

standalone.test/test.cc

@@ -166 +166 @@
   PrintLn();
  
+  return 0;
 }