Changeset 2ebf19 in git


Ignore:
Timestamp:
Feb 7, 2014, 2:52:39 AM (10 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b21a664aa22dc6e196223af8a74ad4885e83547c')
Children:
4bb0d7e00a38076eef7308bd56df54a23f3809c3
Parents:
b3705f89b3bbb155bb15c091c6caea59f94be091
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-02-07 02:52:39+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-02-07 02:55:32+01:00
Message:
Kernel restructurization: numeric moved under kernel/ + fix includes & BS
Files:
1 added
1 deleted
5 edited
6 moved

Legend:

Unmodified
Added
Removed
  • Makefile.am

    rb3705f r2ebf19  
    66
    77SUBDIRS = resources omalloc xalloc $(USE_FACTORY) \
    8 libpolys kernel numeric gfanlib dyn_modules \
     8libpolys kernel gfanlib dyn_modules \
    99IntegerProgramming Singular dox \
    1010emacs debian redhat desktop
  • Singular/Makefile.am

    rb3705f r2ebf19  
    33GIT_VERSION := $(shell $(top_srcdir)/git-version-gen $(top_srcdir)/.tarball-git-version)
    44
    5 AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/numeric -I${top_builddir}/numeric -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) -I${top_srcdir}/factory/include -I${top_builddir}/factory/include $(FACTORY_CFLAGS) $(NTL_CFLAGS) $(FLINT_CFLAGS)   -DGIT_VERSION='"$(GIT_VERSION)"'
     5AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) -I${top_srcdir}/factory/include -I${top_builddir}/factory/include $(FACTORY_CFLAGS) $(NTL_CFLAGS) $(FLINT_CFLAGS)   -DGIT_VERSION='"$(GIT_VERSION)"'
    66
    77if HAVE_GFANLIB
     
    1111endif
    1212
    13 # AM_LDFLAGS = libSingular.la ${top_builddir}/numeric/libnumeric.la ${top_builddir}/kernel/libkernel.la
     13# AM_LDFLAGS = libSingular.la ${top_builddir}/kernel/libkernel.la
    1414
    1515########################### Dynamic Modules... #########################
     
    174174
    175175libSingular_la_LDFLAGS    = ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} -release ${PACKAGE_VERSION}
    176 
    177 libSingular_la_LIBADD      = ${EMBED_PYOBJECT} ${top_builddir}/numeric/libnumeric.la ${top_builddir}/kernel/libkernel.la \
    178 ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    179 
     176libSingular_la_LIBADD      = ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT} ${top_builddir}/kernel/libkernel.la
    180177
    181178libSingular_includedir = ${includedir}/singular/Singular
  • Singular/ipshell.cc

    rb3705f r2ebf19  
    5858#include <coeffs/rmodulon.h>
    5959
    60 #include <numeric/mpr_base.h>
    61 #include <numeric/mpr_numeric.h>
     60#include <kernel/numeric/mpr_base.h>
     61#include <kernel/numeric/mpr_numeric.h>
    6262
    6363#include <math.h>
  • configure.ac

    rb3705f r2ebf19  
    219219AC_CONFIG_FILES([xalloc/Makefile])
    220220AC_CONFIG_FILES([kernel/Makefile])
    221 AC_CONFIG_FILES([numeric/Makefile])
     221AC_CONFIG_FILES([kernel/numeric/Makefile])
    222222
    223223AC_CONFIG_SUBDIRS([gfanlib])
  • kernel/Makefile.am

    rb3705f r2ebf19  
    11ACLOCAL_AMFLAGS = -I ../m4
    22# TODO: use ${top_srcdir} instead of .. in the above?
     3
     4SUBDIRS=numeric
    35
    46noinst_LTLIBRARIES = libkernel.la
     
    5860endif
    5961
    60 libkernel_la_LIBADD   =  ${top_builddir}/libpolys/polys/libpolys.la $(USE_FACTORY)
     62libkernel_la_LIBADD   =  ${builddir}/numeric/libnumeric.la ${top_builddir}/libpolys/polys/libpolys.la $(USE_FACTORY)
    6163### libkernel_la_LDFLAGS    = -release ${PACKAGE_VERSION}
    6264
     
    8284CLEANFILES = $(TESTS)
    8385# $(BUILT_SOURCES)
     86
  • kernel/numeric/mpr_base.h

    rb3705f r2ebf19  
    1010*/
    1111
    12 #include <numeric/mpr_numeric.h>
     12#include "mpr_numeric.h"
    1313
    1414#define SNONE -1
Note: See TracChangeset for help on using the changeset viewer.