Changeset c70920 in git

Timestamp:

Jan 7, 2014, 6:35:13 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f1b9ef6df309b52fb845716a27f07a3e7e39f2bb

Parents:

b3d84d43d109ae0e6239276d5c0df8c449da58d0

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-01-07 18:35:13+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-01-08 10:22:23+01:00

Message:

Better BS: use libtool dependency libs and LIBADD automake feature + cleanup

NOTE: libpolys should not check for flint (only factory works with it)

Files:

• Singular/Makefile.am (modified) (9 diffs)
• dyn_modules/bigintm/Makefile.am (modified) (3 diffs)
• dyn_modules/syzextra/Makefile.am (modified) (3 diffs)
• factory/Makefile.am (modified) (2 diffs)
• kernel/Makefile.am (modified) (4 diffs)
• libpolys/coeffs/Makefile.am (modified) (2 diffs)
• libpolys/configure.ac (modified) (2 diffs)
• libpolys/libpolys-config.in (modified) (1 diff)
• libpolys/misc/Makefile.am (modified) (2 diffs)
• libpolys/polys/Makefile.am (modified) (7 diffs)
• libpolys/reporter/Makefile.am (modified) (2 diffs)
• numeric/Makefile.am (modified) (1 diff)
• resources/Makefile.am (modified) (1 diff)

Singular/Makefile.am

@@ -4 +4 @@
 
 AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/numeric -I${top_builddir}/numeric -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) -I${top_srcdir}/factory/include -I${top_builddir}/factory/include $(FACTORY_CFLAGS) $(NTL_CFLAGS) $(FLINT_CFLAGS) -DHAVE_CONFIG_H  -DGIT_VERSION='"$(GIT_VERSION)"'
-
-if ENABLE_FACTORY
-  USE_FACTORY = -L${top_builddir}/factory
-else
-  USE_FACTORY =
-endif
 
 if HAVE_GFANLIB
@@ -17 +11 @@
 endif
 
-AM_LDFLAGS = -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel -L${top_builddir}/libpolys/polys  -L${top_builddir}/libpolys/coeffs -L${top_builddir}/libpolys/reporter -L${top_builddir}/libpolys/misc $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/resources
+# AM_LDFLAGS = libSingular.la ${top_builddir}/numeric/libnumeric.la ${top_builddir}/kernel/libkernel.la
 
 ########################### Dynamic Modules... #########################
@@ -39 +33 @@
 ##########################################################################
 if PYTHON_USE
-  PY=pyobject.la  $(PYTHON_EXTRA_LIBS)  $(PYTHON_LSPEC) ${AM_LDFLAGS} $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) 
+  PY=pyobject.la  $(PYTHON_EXTRA_LIBS)  $(PYTHON_LSPEC) libSingular.la ${top_builddir}/numeric/libnumeric.la ${top_builddir}/kernel/libkernel.la $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) 
 else !PYTHON_USE
   PY=
@@ -179 +173 @@
 nodist_libSingular_la_SOURCES = feOpt.inc iparith.inc 
 
-libSingular_la_LDFLAGS    = ${AM_LDFLAGS} ${EMBED_PYOBJECT} \
--lnumeric -lkernel -lpolys -lcoeffs -lreporter -lmisc \
-$(FACTORY_LIBS) -lomalloc -lresources $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
-
-libSingular_la_LIBADD      = ${EMBED_PYOBJECT} \
--lnumeric -lkernel -lpolys -lcoeffs -lreporter -lmisc \
-$(FACTORY_LIBS) -lomalloc -lresources $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
-
-# ${top_builddir}/numeric/libnumeric.la ${top_builddir}/kernel/libkernel.la ${top_builddir}/libpolys/polys/libpolys.la 
-
+libSingular_la_LDFLAGS    = ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
+
+libSingular_la_LIBADD      = ${EMBED_PYOBJECT} ${top_builddir}/numeric/libnumeric.la ${top_builddir}/kernel/libkernel.la \
+${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
 
 
@@ -213 +201 @@
 ########################### Singular* #########################
 
-EXTRA_PROGRAMS =  libparse Singulard
+EXTRA_PROGRAMS =  libparse Singulars
 
 # the "optional_programs" variable should be defined in the configure
@@ -223 +211 @@
 Singular ESingular TSingular $(optional_Singular_programs): ${abs_builddir}/LIB
 
-nodist_Singular_SOURCES = libSingular.la
-
 Singular_SOURCES = tesths.cc mmalloc.cc fegetopt.c fegetopt.h utils.cc  utils.h
 
 Singular_LDADD = libSingular.la ${EMBED_PYOBJECT}
 
-Singular_LDFLAGS = ${AM_LDFLAGS} ${EMBED_PYOBJECT}
-
-Singulard_SOURCES = tesths.cc mmalloc.cc fegetopt.c fegetopt.h utils.cc  utils.h
-nodist_Singulard_SOURCES = libSingular.la
+# Singular_LDFLAGS = ${EMBED_PYOBJECT}
+
+Singulars_SOURCES = tesths.cc mmalloc.cc fegetopt.c fegetopt.h utils.cc  utils.h
 
 #  ${EMBED_PYOBJECT_LDFLAGS}  ${EMBED_PYOBJECT_LDFLAGS}
-Singulard_LDADD = libSingular.la ${EMBED_PYOBJECT}
-
-Singulard_LDFLAGS = ${AM_LDFLAGS} ${EMBED_PYOBJECT}
+Singulars_LDADD = libSingular.la ${EMBED_PYOBJECT}
+
+# Singulars_LDFLAGS = -static ${AM_LDFLAGS} ${EMBED_PYOBJECT}
 
 dist_bin_SCRIPTS = singularsurf
@@ -244 +229 @@
 ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DESINGULAR -DPROTO
 # ESingular_LDFLAGS = -static ${AM_LDFLAGS}
-ESingular_LDADD =   -lreporter -lmisc -lomalloc -lresources
+ESingular_LDADD =  ${top_builddir}/libpolys/reporter/libreporter.la \
+${top_builddir}/libpolys/misc/libmisc.la 
+
 
 ESingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptES.inc feOpt.cc
@@ -251 +238 @@
 TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DTSINGULAR -DPROTO
 # TSingular_LDFLAGS = -static ${AM_LDFLAGS}
-TSingular_LDADD =   -lreporter -lmisc -lomalloc -lresources
+TSingular_LDADD =   ${top_builddir}/libpolys/reporter/libreporter.la \
+${top_builddir}/libpolys/misc/libmisc.la 
 
 TSingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptTS.inc feOpt.cc
@@ -262 +250 @@
 libparse_SOURCES = libparse.cc fegetopt.c fegetopt.h utils.cc  utils.h
 
-# # libSingular.la -lnumeric
-libparse_LDADD = -lomalloc
+libparse_LDADD = ${top_builddir}/omalloc/libomalloc.la
 # libparse_LDFLAGS = -static ${AM_LDFLAGS}
 # TODO for libparse: DONE by Hans???

dyn_modules/bigintm/Makefile.am

@@ -7 +7 @@
   check_LTLIBRARIES=bigintm.la 
   
-# if WANT_DEBUG
-# #  noinst_module_LTLIBRARIES+=bigintm_g.la 
-#   check_LTLIBRARIES+=bigintm_g.la 
-# endif
-  
 endif
-
-if ENABLE_FACTORY
-  USE_FACTORY = -L${top_builddir}/factory
-else
-  USE_FACTORY =
-endif
-
-# CXXTEMPLFLAGS = ${PIPE} 
-# 
-# DEBUGCXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${CXXTEMPLFLAGS}
-# 
-# NODEBUGCFLAGS   = -O3 -w -fomit-frame-pointer ${PIPE}
-# NODEBUGCXXFLAGS = -O3 -w -fomit-frame-pointer ${CXXTEMPLFLAGS} -fno-exceptions -fno-rtti
-# ## -fno-implicit-templates?
-# NODEBUGDEFS = -DSING_NDEBUG -DOM_NDEBUG 
-
-# -DHAVE_CONFIG_H??
 
 MYINCLUDES =  -I${top_srcdir} -I${top_builddir} -I${srcdir} \
@@ -36 +14 @@
 $(FACTORY_CFLAGS) $(NTL_CFLAGS) $(GMP_CFLAGS) 
 
-
-#### AM_LDFLAGS = -release ${PACKAGE_VERSION}
-# -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel \
-# -L${top_builddir}/libpolys/polys $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/resources
-
-
-SOURCES = mod_main.cc bigintm.cc bigintm.h
-bigintm_la_SOURCES   = $(SOURCES)
-# bigintm_g_la_SOURCES = $(SOURCES)
+bigintm_la_SOURCES   = mod_main.cc bigintm.cc bigintm.h
 
 if ENABLE_P_PROCS_DYNAMIC
@@ -53 +23 @@
 
 bigintm_la_CPPFLAGS   = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
-#  ${NODEBUGDEFS}
-# bigintm_g_la_CPPFLAGS = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
-
-# bigintm_la_CXXFLAGS   = ${NODEBUGCXXFLAGS}
-# bigintm_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
 
 if ENABLE_P_PROCS_DYNAMIC
-  P_PROCS_MODULE_LDFLAGS = ${AM_LDFLAGS} -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
+  P_PROCS_MODULE_LDFLAGS = -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
+  # Add under Mac OS X: -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
 else
-  P_PROCS_MODULE_LDFLAGS = ${AM_LDFLAGS}
+  P_PROCS_MODULE_LDFLAGS = 
 endif
 
-# Add under Mac OS X: -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
-
 bigintm_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
-# bigintm_g_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGSG}
-
 
 # AM_COLOR_TESTS=always
 #
 # TESTS_ENVIRONMENT  = SINGULARPATH='${abs_top_builddir}/Singular/LIB:${abs_top_srcdir}/Singular/LIB:${abs_top_builddir}/libpolys/polys/.libs:${abs_top_builddir}/factory/gftables:${abs_builddir}/.libs:${abs_srcdir}'
-# TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}' 
+# TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
 # TESTS_ENVIRONMENT += SINGULAR_BIN_DIR='${abs_top_builddir}/Singular'
 #
 # TESTS=test_release.sh
 #
-# # if WANT_DEBUG
-# # TESTS+=test_debug.sh
-# # endif
-#
 # EXTRA_DIST = test.sh $(TESTS)
 

dyn_modules/syzextra/Makefile.am

@@ -6 +6 @@
 -I${top_srcdir}/libpolys -I${top_builddir}/libpolys \
 -I${top_srcdir}/factory/include -I${top_builddir}/factory/include \
-$(FACTORY_CFLAGS) $(NTL_CFLAGS) $(GMP_CFLAGS) 
-
-AM_LDFLAGS = ${GOOGLE_PERFTOOL_LDFLAGS} 
+$(FACTORY_CFLAGS) $(NTL_CFLAGS) $(GMP_CFLAGS) $(GOOGLE_PERFTOOLS_CFLAGS)
 
 module_LTLIBRARIES=syzextra.la 
@@ -25 +23 @@
 syzextra_la_SOURCES   = $(SOURCES)
 syzextra_la_CPPFLAGS  = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
-syzextra_la_LDFLAGS   = ${AM_LDFLAGS} ${P_PROCS_MODULE_LDFLAGS}
+syzextra_la_LDFLAGS   = ${AM_LDFLAGS} ${P_PROCS_MODULE_LDFLAGS} ${GOOGLE_PERFTOOL_LDFLAGS} 
 
 # AM_COLOR_TESTS=always
@@ -35 +33 @@
 # TESTS=test_release.sh
 #
-# # if WANT_DEBUG
-# # TESTS+=test_debug.sh
-# # endif
-#
 # EXTRA_DIST = syzextra.tst ederc.tst test_clear_enum.tst test.sh $(TESTS)

factory/Makefile.am

@@ -8 +8 @@
 lib_LTLIBRARIES = libfactory.la
 
-libfactory_la_LIBADD     = ${builddir}/libfac/libfac.la $(FLINT_LIBS) ${GMP_LIBS} ${NTL_LIBS}
+libfactory_la_LIBADD     = ${builddir}/libfac/libfac.la \
+${builddir}/../omalloc/libomalloc.la ${builddir}/../resources/libresources.la \
+$(FLINT_LIBS) ${GMP_LIBS} ${NTL_LIBS}
+
 ### libfactory_la_LDFLAGS    = -release ${PACKAGE_VERSION}
 
@@ -224 +227 @@
 EXTRA_PROGRAMS = gengftables 
 gengftables_SOURCES = gengftables-conway.cc
-gengftables_LDADD = -L${builddir} -lfactory $(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS)
+gengftables_LDADD = libfactory.la $(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS)
 
 

kernel/Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I ../m4
 # TODO: use ${top_srcdir} instead of .. in the above?
-
-
 
 libkernel_LTLIBRARIES = libkernel.la 
@@ -32 +30 @@
 libkernel_la_SOURCES   = $(SOURCES)
 
+
 KERNELHEADERS = mod2.h polys.h hutil.h stairc.h ideals.h \
         structs.h \
@@ -54 +53 @@
 
 if ENABLE_FACTORY
-  USE_FACTORY = -L${top_builddir}/factory
+  USE_FACTORY = ${top_builddir}/factory/libfactory.la
 else
   USE_FACTORY =
 endif
 
-AM_LDFLAGS = -L${top_builddir}/kernel -L${top_builddir}/libpolys/polys -L${top_builddir}/libpolys/coeffs -L${top_builddir}/libpolys/reporter  -L${top_builddir}/libpolys/misc $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/resources
-
+libkernel_la_LIBADD   =  ${top_builddir}/libpolys/polys/libpolys.la $(USE_FACTORY) 
 
 ### TODO: the following has to be addapted...
@@ -71 +69 @@
 
 test_SOURCES = test.cc
-test_LDADD = -lkernel -lpolys -lcoeffs -lreporter -lmisc \
-$(FACTORY_LIBS) -lomalloc -lresources $(NTL_LIBS) $(GMP_LIBS) \
-${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
+test_LDADD = libkernel.la ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
 
 

libpolys/coeffs/Makefile.am

@@ -24 +24 @@
   bigintmat.h Enumerator.h AE.h OPAE.h AEp.h OPAEp.h AEQ.h OPAEQ.h
 
+if ENABLE_FACTORY
+  USE_FACTORY = ${top_builddir}/../factory/libfactory.la
+else
+  USE_FACTORY =
+endif
+
+libcoeffs_la_LIBADD = ${top_builddir}/reporter/libreporter.la ${top_builddir}/misc/libmisc.la \
+${USE_FACTORY} ${NTL_LIBS} ${GMP_LIBS}
+
 TESTS_ENVIRONMENT = SINGULARPATH='${top_srcdir}/../factory:${top_builddir}/../factory'
 TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='$(top_builddir)' 
@@ -31 +40 @@
 check_PROGRAMS = $(TESTS)
 
-if ENABLE_FACTORY
-  USE_FACTORY = -L${top_builddir}/../factory
-else
-  USE_FACTORY =
-endif
-
-AM_LDFLAGS = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${top_builddir}/../resources
 
 test_SOURCES = test.cc
-test_LDADD   = -lcoeffs -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lresources ${NTL_LIBS} ${GMP_LIBS} 
+test_LDADD   = libcoeffs.la

libpolys/configure.ac

@@ -37 +37 @@
 LB_CHECK_GMP(3.1.1,,AC_MSG_ERROR([Unable to find GMP on your machine: please use --with-gmp=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
 LB_CHECK_NTL(5.0,,AC_MSG_WARN([Unable to find NTL (which is strongly recommended) on your machine: please use --with-ntl=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
+## LB_CHECK_FLINT(2.3,,AC_MSG_WARN([Unable to find FLINT (which is strongly recommended) on your machine: please use --with-flint=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
+
 
 # Checks for library functions.
@@ -100 +102 @@
 AX_PYTHON_WITH_VERSION([2.4])
 
+AC_DEFINE_UNQUOTED([FACTORY_CFLAGS],"$FACTORY_CFLAGS",[FACTORY_CFLAGS])
+AC_DEFINE_UNQUOTED([FACTORY_LIBS],"$FACTORY_LIBS",[FACTORY_LIBS])
+
+AC_DEFINE_UNQUOTED([NTL_CFLAGS],"$NTL_CFLAGS",[NTL_CFLAGS])
+AC_DEFINE_UNQUOTED([NTL_LIBS],"$NTL_LIBS",[NTL_LIBS])
+
+AC_DEFINE_UNQUOTED([GMP_CFLAGS],"$GMP_CFLAGS",[GMP_CFLAGS])
+AC_DEFINE_UNQUOTED([GMP_LIBS],"$GMP_LIBS",[GMP_LIBS])
+
+# AC_DEFINE_UNQUOTED([FLINT_CFLAGS],"$FLINT_CFLAGS",[FLINT_CFLAGS])
+# AC_DEFINE_UNQUOTED([FLINT_LIBS],"$FLINT_LIBS",[FLINT_LIBS])
+
 ## AC_DEFINE([HAVE_POLYEXTENSIONS], [1], [Enable the algebraic & transcendental extensions])
 

libpolys/libpolys-config.in

@@ -89 +89 @@
 
     --cflags)
-        ${ECHOn} " -I${includedir} -I${includedir}/singular @FACTORY_CFLAGS@ @FLINT_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@ -DSING_NDEBUG -DOM_NDEBUG"
+        ${ECHOn} " -I${includedir} -I${includedir}/singular @FACTORY_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@ -DSING_NDEBUG -DOM_NDEBUG"
         ;;
 
     --cflagswithdebug)
-        ${ECHOn} " -I${includedir} -I${includedir}/singular @FACTORY_CFLAGS@ @FLINT_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@"
+        ${ECHOn} " -I${includedir} -I${includedir}/singular @FACTORY_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@"
         ;;
 
     --libs)
-        ${ECHOn} " -L${libdir} -L${libdir}/singular -lpolys -lcoeffs -lreporter -lmisc @FACTORY_LIBS@ -lomalloc -lresources @FLINT_LIBS@ @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@" 
+        ${ECHOn} " -L${libdir}/singular/libpolys.la" 
         ;;
 

libpolys/misc/Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I ../../m4
-
-# CXXTEMPLFLAGS      =-ftrapv -fno-implicit-templates
 
 AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..  -DHAVE_CONFIG_H
 
-# if WANT_DEBUG
-#   LIB_G=libmisc_g.la
-# else
-#   LIB_G=
-# endif
-
 libmisc_LTLIBRARIES = libmisc.la 
-# ${LIB_G}
 libmiscdir = $(libdir)/singular
 
-# libmisc_la_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
-# libmisc_g_la_CFLAGS = ${PIPE}
-# 
-# libmisc_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS}
-# libmisc_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
-# # -fdiagnostics-show-option 
- 
-# libmisc_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DSING_NDEBUG -DOM_NDEBUG
-# libmisc_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
-# libmisc_la_CPPFLAGS = ${AM_CPPFLAGS}
+noinst_LTLIBRARIES = libintvec.la
 
-
-noinst_LTLIBRARIES = libintvec.la
-# libintvec_g.la
-
-libmisc_la_LIBADD = libintvec.la
-# libmisc_g_la_LIBADD = libintvec_g.la
+libmisc_la_LIBADD = libintvec.la \
+${top_builddir}/../omalloc/libomalloc.la ${top_builddir}/../resources/libresources.la
 
 # libmisc_la_LDFLAGS    = -release ${PACKAGE_VERSION}
 
-SOURCES  = int64vec.cc options.c
-libmisc_la_SOURCES   = $(SOURCES)
-# libmisc_g_la_SOURCES = $(SOURCES)
-
+libmisc_la_SOURCES   = int64vec.cc options.c
 
 libmisc_includedir = $(includedir)/singular/misc
@@ -45 +20 @@
 
 nodist_libmisc_la_SOURCES   = auxiliary.h 
-# nodist_libmisc_g_la_SOURCES = auxiliary.h 
+
+libintvec_la_SOURCES = intvec.cc 
 
 
-libintvec_la_SOURCES = intvec.cc 
-# libintvec_g_la_SOURCES = ${libintvec_la_SOURCES}
-
-
-# libintvec_la_CXXFLAGS = -O3 -fomit-frame-pointer ${PIPE} -fwrapv -fno-implicit-templates
-# libintvec_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} -fwrapv -fno-implicit-templates
-
-# libintvec_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DSING_NDEBUG -DOM_NDEBUG
-# libintvec_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
-# libintvec_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
-

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 = -DSING_NDEBUG -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
@@ -35 +25 @@
 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
 
@@ -87 +69 @@
 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_MODULE_LDFLAGS = -shared -module -dynamic -export-dynamic -avoid-version -weak_reference_mismatches weak -undefined dynamic_lookup -Wl,-undefined -Wl,dynamic_lookup -flat_namespace
@@ -109 +81 @@
 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 +88 @@
 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
 
 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 +100 @@
 
 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_LIBADD = ${top_builddir}/coeffs/libcoeffs.la
+
 ### libpolys_la_LDFLAGS    = -release ${PACKAGE_VERSION}
-
 
 #################################################
@@ -162 +116 @@
 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)

libpolys/reporter/Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I ../../m4
-
-# CXXTEMPLFLAGS =-ftrapv  
-## -fno-implicit-templates
 
 AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..  -DHAVE_CONFIG_H
 
-# if WANT_DEBUG
-#   LIB_G=libreporter_g.la
-# else
-#   LIB_G=
-# endif
+libreporter_LTLIBRARIES = libreporter.la 
 
-libreporter_LTLIBRARIES = libreporter.la 
-# ${LIB_G}
 libreporterdir = $(libdir)/singular
 
-# libreporter_la_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
-# libreporter_g_la_CFLAGS = ${PIPE}
-# 
-# libreporter_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS}
-# libreporter_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
-# # -fdiagnostics-show-option 
-
-# libreporter_la_CPPFLAGS   = ${AM_CPPFLAGS} -DSING_NDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
-# libreporter_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
-# libreporter_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
-
-
-SOURCES  = dError.cc reporter.cc
-libreporter_la_SOURCES   = $(SOURCES)
-# libreporter_g_la_SOURCES = $(SOURCES)
+libreporter_la_SOURCES   = dError.cc reporter.cc
 
 ## libreporter_la_LDFLAGS    = -release ${PACKAGE_VERSION}
@@ -38 +15 @@
 libreporter_include_HEADERS   = reporter.h 
 
+libreporter_la_LIBADD = ${top_builddir}/misc/libmisc.la
 
-

numeric/Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I ../m4
 
-# if WANT_DEBUG
-#   LIB_G=libnumeric_g.la
-# else
-#   LIB_G=
-# endif
-# 
 libnumeric_LTLIBRARIES = libnumeric.la
-# ${LIB_G}
+
 libnumericdir = $(libdir)/singular
-
-# CXXTEMPLFLAGS =-ftrapv  ## -fno-implicit-templates
-# 
-# libnumeric_la_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
-# libnumeric_g_la_CFLAGS = ${PIPE}
-# 
-# libnumeric_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS}
-# libnumeric_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
-# # -fdiagnostics-show-option 
 
 AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys ${GMP_CFLAGS} -I${top_srcdir}/factory/include -I${top_builddir}/factory/include ${FACTORY_CFLAGS} ${NTL_CFLAGS}  -DHAVE_CONFIG_H
 
-# libnumeric_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DSING_NDEBUG -DOM_NDEBUG
-# libnumeric_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H 
-# libnumeric_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H 
-
 SOURCES  = mpr_base.cc mpr_inout.cc mpr_numeric.cc
 libnumeric_la_SOURCES   = $(SOURCES)
-# libnumeric_g_la_SOURCES = $(SOURCES)
+
+libnumeric_la_LIBADD = ${top_builddir}/kernel/libkernel.la ${top_builddir}/libpolys/polys/libpolys.la
 
 ### libnumeric_la_LDFLAGS    = -release ${PACKAGE_VERSION}

resources/Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I ../m4
 
-#if WANT_DEBUG
-#  LIB_G=libresources_g.la
-#else
-#  LIB_G=
-#endif
+libresources_LTLIBRARIES = libresources.la
 
-libresources_LTLIBRARIES = libresources.la
-# ${LIB_G}
 libresourcesdir = $(libdir)
 
-#CXXTEMPLFLAGS =-ftrapv 
-### -fno-implicit-templates
-
-#libresources_la_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
-#libresources_g_la_CFLAGS = ${PIPE}
-
-#libresources_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS} -fno-exceptions -fno-rtti
-#libresources_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
-# -fdiagnostics-show-option 
 
 AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -DHAVE_CONFIG_H
 
-# libresources_la_CPPFLAGS   += ${AM_CPPFLAGS}
-
-#libresources_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DSING_NDEBUG -DOM_NDEBUG
-#libresources_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H 
 
 SOURCES  = omFindExec.c feResource.cc feFopen.cc
 libresources_la_SOURCES   = $(SOURCES)
-# libresources_g_la_SOURCES = $(SOURCES)
 
 ### libresources_la_LDFLAGS    = -release ${PACKAGE_VERSION}