Changeset 933be8 in git

Timestamp:

Jan 8, 2014, 7:38:34 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

974aa2b935f392585b96f601c41d9917101f6dd4

Parents:

9a6ff9955d9edb236345792b7cb96ead677b27eb

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-01-08 19:38:34+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-01-08 19:39:55+01:00

Message:

Cleanup + warning elimination

Files:

• Singular/test.cc (modified) (2 diffs)
• libpolys/polys/Makefile.am (modified) (3 diffs)

Singular/test.cc

@@ +1 @@
+#ifdef HAVE_CONFIG_H
+#include "singularconfig.h"
+#endif /* HAVE_CONFIG_H */
+
+#include <kernel/mod2.h>
+
+#include <omalloc/omalloc.h>
 #include <misc/auxiliary.h>
 
 #include <factory/factory.h> // :(
 
-#include <omalloc/omalloc.h>
 
 #include <misc/intvec.h>
@@ -55 +61 @@
 #include <kernel/polys.h>
 
-
-#ifdef HAVE_CONFIG_H
-#include "singularconfig.h"
-#endif /* HAVE_CONFIG_H */
-#include <kernel/mod2.h>
 
 #include <kernel/structs.h>

libpolys/polys/Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I ../../m4
-
-DEBUGCXXFLAGS   =
-NODEBUGCFLAGS   =
-NODEBUGCXXFLAGS =
-NODEBUGDEFS     =
 
 AM_CPPFLAGS     = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${top_srcdir}/../factory/include -I${top_builddir}/../factory/include ${GMP_CFLAGS}  
@@ -64 +59 @@
 
 
-p_Procs_FieldGeneral_la_CPPFLAGS = -Dp_Procs_FieldGeneral ${P_PROCS_CPPFLAGS_COMMON} ${NODEBUGDEFS}
-p_Procs_FieldIndep_la_CPPFLAGS = -Dp_Procs_FieldIndep ${P_PROCS_CPPFLAGS_COMMON} ${NODEBUGDEFS}
-p_Procs_FieldQ_la_CPPFLAGS = -Dp_Procs_FieldQ ${P_PROCS_CPPFLAGS_COMMON} ${NODEBUGDEFS}
-p_Procs_FieldZp_la_CPPFLAGS = -Dp_Procs_FieldZp ${P_PROCS_CPPFLAGS_COMMON} ${NODEBUGDEFS}
-
-p_Procs_FieldGeneral_la_CXXFLAGS = ${NODEBUGCXXFLAGS}
-p_Procs_FieldIndep_la_CXXFLAGS = ${NODEBUGCXXFLAGS}
-p_Procs_FieldQ_la_CXXFLAGS = ${NODEBUGCXXFLAGS}
-p_Procs_FieldZp_la_CXXFLAGS = ${NODEBUGCXXFLAGS}
+p_Procs_FieldGeneral_la_CPPFLAGS = -Dp_Procs_FieldGeneral ${P_PROCS_CPPFLAGS_COMMON}
+p_Procs_FieldIndep_la_CPPFLAGS = -Dp_Procs_FieldIndep ${P_PROCS_CPPFLAGS_COMMON}
+p_Procs_FieldQ_la_CPPFLAGS = -Dp_Procs_FieldQ ${P_PROCS_CPPFLAGS_COMMON}
+p_Procs_FieldZp_la_CPPFLAGS = -Dp_Procs_FieldZp ${P_PROCS_CPPFLAGS_COMMON}
 
 P_PROCS_MODULE_LDFLAGS = -shared -module -dynamic -export-dynamic -avoid-version -weak_reference_mismatches weak -undefined dynamic_lookup -Wl,-undefined -Wl,dynamic_lookup -flat_namespace
@@ -103 +93 @@
 EXTRA_libpolys_la_SOURCES = templates/p_Procs_Static.cc templates/p_Procs_Dynamic.cc
 
-libpolys_la_CPPFLAGS = ${NODEBUGDEFS} ${AM_CPPFLAGS}
 
 libpolys_la_LDFLAGS    = -release ${PACKAGE_VERSION}