Changeset 59f97c in git


Ignore:
Timestamp:
May 5, 2014, 10:34:49 PM (9 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'c987db42cd2ec943b97ac5746c99892ceddf909c')
Children:
aab74b41aad1e467f6d1fc08d313d0b363dd7885
Parents:
0843930f4eafe977ed3d6effec27c16019f87dcd
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-05-05 22:34:49+02:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-05-07 04:41:42+02:00
Message:
Defined libkernelCommon.la to be the actual shared part of libkernel.la
Location:
kernel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • kernel/Makefile.am

    r084393 r59f97c  
    11ACLOCAL_AMFLAGS = -I ../m4
    2 # TODO: use ${top_srcdir} instead of .. in the above?
    32
    4 SUBDIRS=numeric fglm groebner_walk combinatorics spectrum linear_algebra maps GBEngine oswrapper 
    5 
    6 noinst_LTLIBRARIES = libkernel.la
    7 ###### libkerneldir = $(libdir)/singular
     3noinst_LTLIBRARIES = libkernelCommon.la libkernel.la
    84
    95AM_CPPFLAGS = \
     
    1713    mod2.h
    1814
    19  
    20 libkernel_la_SOURCES   = $(SOURCES)
     15libkernelCommon_la_SOURCES  = $(SOURCES)
     16libkernelCommon_la_LIBADD   = ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} \
     17${abs_top_builddir}/libpolys/polys/libpolys.la
    2118
    22 KERNELHEADERS = mod2.h polys.h ideals.h \
    23         structs.h \
    24         preimage.h fast_mult.h \
    25         digitech.h
    26        
     19###### libkerneldir = $(libdir)/singular
    2720
    28 libkernel_la_includedir  =${includedir}/singular/kernel
    29 libkernel_la_include_HEADERS   = $(KERNELHEADERS)
     21KERNELHEADERS = mod2.h structs.h polys.h ideals.h \
     22        preimage.h fast_mult.h digitech.h
     23
     24libkernel_la_SOURCES=$(KERNELHEADERS)
     25
     26libkernel_la_includedir=${includedir}/singular/kernel
     27libkernel_la_include_HEADERS=$(KERNELHEADERS)
     28
     29SUBDIRS=numeric fglm groebner_walk combinatorics spectrum linear_algebra maps GBEngine oswrapper 
    3030
    3131libkernel_la_LIBADD   = \
     
    3939${builddir}/GBEngine/libGBEngine.la \
    4040${builddir}/oswrapper/liboswrapper.la \
    41 ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} \
    42 ${abs_top_builddir}/libpolys/polys/libpolys.la
     41${builddir}/libkernelCommon.la
    4342
    4443### TODO: the following has to be addapted...
     
    6362# $(BUILT_SOURCES)
    6463
     64
  • kernel/test.cc

    r084393 r59f97c  
    1 
    21#include <kernel/mod2.h>
    3 
    4 #include "mod2.h"
    52
    63#include <omalloc/omalloc.h>
Note: See TracChangeset for help on using the changeset viewer.