Changeset 148d3c in git for libpolys/polys/Makefile.am

Timestamp:

May 19, 2011, 5:39:53 AM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

c8204aefe85bd27523a76a77f4ae555c156bdc21

Parents:

3199ac3605af0f6ec91729ae32d5704af6105991

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-05-19 05:39:53+02:00

git-committer:

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

Message:

FIX: fixing the build system (install needed headers on needed places)
FIX: libpolys-config is correct now (installed, echo -n-fixed)
ADD: trying to use FACTORY_{libs, cflags} as for gmp/ntl
CHG: switched from omalloc_debug to omalloc_g
ADD: symlink for gftables in libpolys/tests

File:

• libpolys/polys/Makefile.am (modified) (5 diffs)

libpolys/polys/Makefile.am

@@ -30 +30 @@
 endif
 
+lib_LIBRARIES=libpolys.a libpolys_g.a
+
+libpolys_a_includedir=$(includedir)/libpolys/polys
+libpolys_g_a_includedir=$(includedir)/libpolys/polys
+
 SOURCES = \
         monomials/monomials.cc monomials/p_polys.cc monomials/ring.cc monomials/maps.cc \
@@ -44 +49 @@
 noinst_HEADERS =
 
-include_HEADERS = \
-        monomials/ring.h nc/nc.h \
-  nc/sca.h nc/summator.h nc/ncSAFormula.h nc/ncSACache.h nc/ncSAMult.h \
+LIBPOLYSHEADERS = monomials/ring.h monomials/monomials.h \
+        nc/nc.h nc/sca.h nc/summator.h nc/ncSAFormula.h nc/ncSACache.h nc/ncSAMult.h \
         pInline0.h operations/pShallowCopyDelete.h \
         templates/p_MemAdd.h templates/p_MemCmp.h templates/p_MemCopy.h operations/p_Mult_q.h \
@@ -54 +58 @@
         kbuckets.h sbuckets.h simpleideals.h weight.h matpol.h \
         ext_fields/algext.h clapsing.h clapconv.h
+
+### nobase_include_HEADERS = $(LIBPOLYSHEADERS)
+
+
 
 P_PROCS_CPPFLAGS_COMMON = -DHAVE_CONFIG_H -DDYNAMIC_VERSION 
@@ -103 +111 @@
 
 
-
-lib_LIBRARIES=libpolys.a libpolys_g.a
-
-moduledir = ${libdir}/singular/MOD/
+moduledir = $(libdir)/libpolys/MOD/
 
 if ENABLE_P_PROCS_DYNAMIC
@@ -113 +118 @@
 endif
 
+
+nobase_libpolys_a_include_HEADERS = $(LIBPOLYSHEADERS)
+nobase_libpolys_g_a_include_HEADERS = $(LIBPOLYSHEADERS)
+
+
 libpolys_a_SOURCES = ${SOURCES}
 libpolys_g_a_SOURCES = ${SOURCES}
 
+## libpolys_adir = $(libdir)/libpolys
+## libpolys_g_adir = $(libdir)/libpolys
+
 EXTRA_libpolys_a_SOURCES = templates/p_Procs_Static.cc templates/p_Procs_Dynamic.cc
-
-libpolys_a_includedir  =$(includedir)/libpolys/polys
-libpolys_g_a_includedir=$(includedir)/libpolys/polys
 
 EXTRA_PROGRAMS = templates/p_Procs_Generate