Changeset 8baa37 in git for libpolys/polys/Makefile.am

Timestamp:

Jan 24, 2014, 1:39:15 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ee5e11e63c911034966a67782a24e7326c52abb1

Parents:

5c8e18ff3dc32f83461ed21cad1151a77366ed567661e1502f806195a6458595ba7e711664a932bb

Message:

Merge pull request #456 from surface-smoothers/improve.documentation.genus

improved genus documentation for 1-dim affine variety input

File:

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

libpolys/polys/Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I ../../m4
 
-# CXXTEMPLFLAGS =  ## -fno-implicit-templates
-# 
-# DEBUGCXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long
-# 
-# NODEBUGCFLAGS   = -O3 -w -fomit-frame-pointer
-# NODEBUGCXXFLAGS = -O3 -w -fomit-frame-pointer 
-# NODEBUGDEFS = -DNDEBUG -DOM_NDEBUG 
-DEBUGCXXFLAGS   =
-NODEBUGCFLAGS   =
-NODEBUGCXXFLAGS =
-NODEBUGDEFS     =
-
-# AM_CFLAGS     = ${PIPE}
-# AM_CXXFLAGS   = ${PIPE} ${CXXTEMPLFLAGS}
-
-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}  -DHAVE_CONFIG_H
+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}  
 
 
@@ -35 +20 @@
 endif
 
-# if WANT_DEBUG
-#   LIB_G=libpolys_g.la
-#   MOD_G=p_Procs_FieldGeneral_g.la p_Procs_FieldIndep_g.la p_Procs_FieldQ_g.la p_Procs_FieldZp_g.la
-# else
-#   LIB_G=
-#   MOD_G=
-# endif
 
 libpolys_LTLIBRARIES = libpolys.la
-# ${LIB_G}
-libpolysdir = $(libdir)/singular
+libpolysdir = $(libdir)
 
 SOURCES = \
@@ -82 +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_g_la_CPPFLAGS = -Dp_Procs_FieldGeneral ${P_PROCS_CPPFLAGS_COMMON}
-# p_Procs_FieldIndep_g_la_CPPFLAGS = -Dp_Procs_FieldIndep ${P_PROCS_CPPFLAGS_COMMON}
-# p_Procs_FieldQ_g_la_CPPFLAGS = -Dp_Procs_FieldQ ${P_PROCS_CPPFLAGS_COMMON}
-# p_Procs_FieldZp_g_la_CPPFLAGS = -Dp_Procs_FieldZp ${P_PROCS_CPPFLAGS_COMMON}
-
-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_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
-# p_Procs_FieldIndep_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
-# p_Procs_FieldQ_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
-# p_Procs_FieldZp_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
+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
@@ -109 +71 @@
 p_Procs_FieldZp_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
 
-# p_Procs_FieldGeneral_g_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGSG}
-# p_Procs_FieldIndep_g_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGSG}
-# p_Procs_FieldQ_g_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGSG}
-# p_Procs_FieldZp_g_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGSG}
-
-
 P_PROCS = templates/p_Procs_Lib.cc
 
@@ -122 +78 @@
 p_Procs_FieldZp_la_SOURCES = ${P_PROCS}
 
-# p_Procs_FieldGeneral_g_la_SOURCES = ${P_PROCS}
-# p_Procs_FieldIndep_g_la_SOURCES = ${P_PROCS}
-# p_Procs_FieldQ_g_la_SOURCES = ${P_PROCS}
-# p_Procs_FieldZp_g_la_SOURCES = ${P_PROCS}
 
-
-# moduledir = $(bindir)
-moduledir = $(libexecdir)/singular/MOD/
+moduledir = $(libexecdir)/singular/MOD
 
 if ENABLE_P_PROCS_DYNAMIC
   module_LTLIBRARIES=p_Procs_FieldGeneral.la p_Procs_FieldIndep.la p_Procs_FieldQ.la p_Procs_FieldZp.la
-  
-# if WANT_DEBUG
-#   module_LTLIBRARIES+=p_Procs_FieldGeneral_g.la p_Procs_FieldIndep_g.la p_Procs_FieldQ_g.la p_Procs_FieldZp_g.la
-# endif
-
 endif
 
@@ -145 +90 @@
 
 libpolys_la_SOURCES = ${SOURCES}
-# libpolys_g_la_SOURCES = ${SOURCES}
 
 EXTRA_libpolys_la_SOURCES = templates/p_Procs_Static.cc templates/p_Procs_Dynamic.cc
 
-# libpolys_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
-libpolys_la_CPPFLAGS = ${NODEBUGDEFS} ${AM_CPPFLAGS}
 
-### libpolys_la_LDFLAGS    = -release ${PACKAGE_VERSION}
+libpolys_la_LDFLAGS    = -release ${PACKAGE_VERSION}
+libpolys_la_LIBADD = ${top_builddir}/coeffs/libcoeffs.la
 
 
@@ -162 +105 @@
 noinst_PROGRAMS = templates/p_Procs_Generate
 templates_p_Procs_Generate_SOURCES = templates/p_Procs_Generate.cc
-# templates_p_Procs_Generate_CFLAGS   = ${NODEBUGCFLAGS}
-# templates_p_Procs_Generate_CXXFLAGS = ${NODEBUGCXXFLAGS}
 templates_p_Procs_Generate_CPPFLAGS = ${USE_P_PROCS_STATIC} ${AM_CPPFLAGS}
-
-templates_p_Procs_Generate_LDADD    = -lreporter -lmisc -lomalloc -lresources
-templates_p_Procs_Generate_LDFLAGS  = -L${builddir} -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/misc -L${top_builddir}/../omalloc -L${top_builddir}/../resources
+templates_p_Procs_Generate_LDADD    = ${top_builddir}/reporter/libreporter.la ${top_builddir}/misc/libmisc.la
 
 templates/p_Procs.inc: templates/p_Procs_Generate$(EXEEXT)