Changeset 57c6ed2 in git

Timestamp:

Mar 25, 2011, 8:03:49 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

cf3743ac8056f3ef32435fb19bfb2336330b8591

Parents:

c45b2dc39dc745a56b92c3c59742e2fbe4f23e07

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-03-25 20:03:49+01:00

git-committer:

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

Message:

fix: debug/optimized for polys

Location:

libpolys/polys

Files:

• Makefile.am (modified) (6 diffs)
• configure.ac (modified) (2 diffs)

libpolys/polys/Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I m4
 CXXTEMPLFLAGS   = -fno-implicit-templates --no-exceptions
-AM_CFLAGS       = -O3 -w -fomit-frame-pointer ${PIPE}
-AM_CXXFLAGS     = -O3 -w -fomit-frame-pointer --no-rtti ${PIPE} ${CXXTEMPLFLAGS}
+
+
+DEBUGCXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long
+
+NODEBUGCFLAGS   = -O3 -w -fomit-frame-pointer
+NODEBUGCXXFLAGS = -O3 -w -fomit-frame-pointer --no-rtti 
+NODEBUGCPPFLAGS = -DNDEBUG -DOM_NDEBUG 
+
+AM_CPPFLAGS     = -DHAVE_CONFIG_H
+
+AM_CFLAGS       = ${PIPE}
+AM_CXXFLAGS     = ${PIPE} ${CXXTEMPLFLAGS}
+
 INCLUDES        = -I${top_srcdir}/.. -I${top_srcdir}/../.. -I${top_builddir}/.. -I${srcdir} -I${includedir}
-AM_CPPFLAGS     = -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
 AM_LDFLAGS      = -L${top_builddir}/../coeffs -L${top_builddir}/../reporter -L${top_builddir}/../resources -L${top_builddir}/../../omalloc -L${builddir}
-
-## we removed -Dix86_Linux from AM_CPPFLAGS
 
 SOURCES = \
@@ -22 +30 @@
 
 include_HEADERS = \
-        monomials/ring.h \
+        monomials/ring.h monomials/nc.h \
         pInline0.h operations/pShallowCopyDelete.h \
         templates/p_MemAdd.h templates/p_MemCmp.h templates/p_MemCopy.h operations/p_Mult_q.h \
@@ -30 +38 @@
         kbuckets.h sbuckets.h simpleideals.h weight.h
 
-P_PROCS_CPPFLAGS_COMMON = -DDYNAMIC_VERSION
-libp_Procs_FieldGeneral_la_CPPFLAGS = -Dp_Procs_FieldGeneral ${P_PROCS_CPPFLAGS_COMMON}
-libp_Procs_FieldIndep_la_CPPFLAGS = -Dp_Procs_FieldIndep ${P_PROCS_CPPFLAGS_COMMON}
-libp_Procs_FieldQ_la_CPPFLAGS = -Dp_Procs_FieldQ ${P_PROCS_CPPFLAGS_COMMON}
-libp_Procs_FieldZp_la_CPPFLAGS = -Dp_Procs_FieldZp ${P_PROCS_CPPFLAGS_COMMON}
+P_PROCS_CPPFLAGS_COMMON = -DHAVE_CONFIG_H -DDYNAMIC_VERSION 
+
+libp_Procs_FieldGeneral_la_CPPFLAGS = -Dp_Procs_FieldGeneral ${P_PROCS_CPPFLAGS_COMMON} ${NODEBUGCPPFLAGS}
+libp_Procs_FieldIndep_la_CPPFLAGS = -Dp_Procs_FieldIndep ${P_PROCS_CPPFLAGS_COMMON} ${NODEBUGCPPFLAGS}
+libp_Procs_FieldQ_la_CPPFLAGS = -Dp_Procs_FieldQ ${P_PROCS_CPPFLAGS_COMMON} ${NODEBUGCPPFLAGS}
+libp_Procs_FieldZp_la_CPPFLAGS = -Dp_Procs_FieldZp ${P_PROCS_CPPFLAGS_COMMON} ${NODEBUGCPPFLAGS}
+
+libp_Procs_FieldGeneral_g_la_CPPFLAGS = -Dp_Procs_FieldGeneral ${P_PROCS_CPPFLAGS_COMMON}
+libp_Procs_FieldIndep_g_la_CPPFLAGS = -Dp_Procs_FieldIndep ${P_PROCS_CPPFLAGS_COMMON}
+libp_Procs_FieldQ_g_la_CPPFLAGS = -Dp_Procs_FieldQ ${P_PROCS_CPPFLAGS_COMMON}
+libp_Procs_FieldZp_g_la_CPPFLAGS = -Dp_Procs_FieldZp ${P_PROCS_CPPFLAGS_COMMON}
+
+libp_Procs_FieldGeneral_la_CXXFLAGS = ${NODEBUGCXXFLAGS}
+libp_Procs_FieldIndep_la_CXXFLAGS = ${NODEBUGCXXFLAGS}
+libp_Procs_FieldQ_la_CXXFLAGS = ${NODEBUGCXXFLAGS}
+libp_Procs_FieldZp_la_CXXFLAGS = ${NODEBUGCXXFLAGS}
+
+libp_Procs_FieldGeneral_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
+libp_Procs_FieldIndep_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
+libp_Procs_FieldQ_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
+libp_Procs_FieldZp_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
+
 
 P_PROCS = templates/p_Procs_Lib.cc
@@ -43 +68 @@
 libp_Procs_FieldZp_la_SOURCES = ${P_PROCS}
 
-#-g -Wextra -Wall -pedantic -Wno-long-long
+libp_Procs_FieldGeneral_g_la_SOURCES = ${P_PROCS}
+libp_Procs_FieldIndep_g_la_SOURCES = ${P_PROCS}
+libp_Procs_FieldQ_g_la_SOURCES = ${P_PROCS}
+libp_Procs_FieldZp_g_la_SOURCES = ${P_PROCS}
+
+
 
 lib_LIBRARIES=libpolys.a libpolys_g.a
@@ -49 +79 @@
 moduledir = ${libdir}/singular/MOD/
 
-module_LTLIBRARIES=libp_Procs_FieldGeneral.la libp_Procs_FieldIndep.la libp_Procs_FieldQ.la libp_Procs_FieldZp.la
-#               libp_Procs_FieldGeneral_g.la libp_Procs_FieldIndep_g.la libp_Procs_FieldQ_g.la libp_Procs_FieldZp_g.la
+module_LTLIBRARIES=libp_Procs_FieldGeneral.la libp_Procs_FieldIndep.la libp_Procs_FieldQ.la libp_Procs_FieldZp.la \
+                   libp_Procs_FieldGeneral_g.la libp_Procs_FieldIndep_g.la libp_Procs_FieldQ_g.la libp_Procs_FieldZp_g.la
 
 libpolys_a_SOURCES = ${SOURCES}
@@ -61 +91 @@
 libpolys_g_a_DEPENDENCIES = $(DL_KERNEL_OBJECT_DEBUG)
 
+
+libpolys_a_includedir  =$(includedir)/libpolys/polys
+libpolys_g_a_includedir=$(includedir)/libpolys/polys
+
 EXTRA_PROGRAMS = templates/p_Procs_Generate
 templates_p_Procs_Generate_SOURCES = templates/p_Procs_Generate.cc
+
+
+###test_LDADD   = libcoeffs.a -lresources -lreporter -lgmp -lomalloc
+
+templates_p_Procs_Generate_CFLAGS   = ${NODEBUGCFLAGS}
+templates_p_Procs_Generate_CXXFLAGS = ${NODEBUGCXXFLAGS}
+templates_p_Procs_Generate_CPPFLAGS = ${NODEBUGCPPFLAGS}
+templates_p_Procs_Generate_LDADD    = -lreporter
+
 
 templates/p_Procs.inc: templates/p_Procs_Generate
         ${builddir}/templates/p_Procs_Generate > ${builddir}/templates/p_Procs.inc
 
-libpolys_g_a_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long
+libpolys_g_a_CXXFLAGS = ${DEBUGCXXFLAGS}
 #  -fdiagnostics-show-option
 

libpolys/polys/configure.ac

@@ -3 +3 @@
 
 AC_PREREQ([2.65])
-AC_INIT([FULL-PACKAGE-NAME], [VERSION], [BUG-REPORT-ADDRESS])
+AC_INIT([polys], [3.1.2.sw])
 AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE
@@ -17 +17 @@
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
+AM_PROG_CC_C_O
 
 # Checks for libraries.