Changeset 667d33 in git for kernel

Timestamp:

Jan 6, 2014, 5:18:21 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

b1b9e1f448aca273a22cb770fd8bde277e3e8a1d

Parents:

17fe09de3facd16159d0da4c0fb5bd476fb4180d

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-01-06 17:18:21+01:00

git-committer:

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

Message:

Only test once (no more dynamic AND static tests)

chg: also BS cleanup

File:

• kernel/Makefile.am (modified) (3 diffs)

kernel/Makefile.am

@@ -2 +2 @@
 # TODO: use ${top_srcdir} instead of .. in the above?
 
-# PIPE = -pipe
-# ???
-#LD_DYN_FLAGS   = -ldl -rdynamic
-#SFLAGS         = -fpic -DPIC
-#SLDFLAGS       = -shared
-#LD_LIBC                = -lc
-#STATIC_LDFLAGS = -static
 
 
-# CXXTEMPLFLAGS =-ftrapv ## -fno-implicit-templates
-# 
-# if WANT_DEBUG
-#   LIB_G=libkernel_g.la
-# else
-#   LIB_G=
-# endif
-
 libkernel_LTLIBRARIES = libkernel.la 
-# ${LIB_G}
 libkerneldir = $(libdir)/singular
 
-#libkernel_la_CFLAGS   = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE}
-#libkernel_g_la_CFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE}
-## -pedantic
-
-#libkernel_la_CXXFLAGS   = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
-#libkernel_g_la_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${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
-
-# libkernel_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
-# libkernel_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
-
-### libkernel_la_LDFLAGS    = -release ${PACKAGE_VERSION}
-
 
 SOURCES = polys.cc febase.cc feread.cc \
@@ -61 +31 @@
 
 libkernel_la_SOURCES   = $(SOURCES)
-# libkernel_g_la_SOURCES = $(SOURCES)
 
 KERNELHEADERS = mod2.h polys.h hutil.h stairc.h ideals.h \
@@ -97 +66 @@
 TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
 
-# if WANT_DEBUG
-# TESTS = test-s-g test-s-r test-d-g test-d-r
-# else
-TESTS = test-s-r test-d-r
-# endif
+TESTS = test
+
 check_PROGRAMS = $(TESTS)
 
-# test_s_r_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
-# test_s_g_CFLAGS = ${PIPE}
-# 
-# test_s_r_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
-# test_s_g_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)
+test_SOURCES = test.cc
+test_LDADD = -lkernel -lpolys -lcoeffs -lreporter -lmisc \
+$(FACTORY_LIBS) -lomalloc -lresources $(NTL_LIBS) $(GMP_LIBS) \
+${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
 
-testsources = test.cc
-test_s_r_SOURCES = $(testsources)
-# test_s_g_SOURCES = $(testsources)
-
-test_s_r_LDADD = -lkernel -lpolys -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lresources $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
-# test_s_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lresources_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
-
-# test_s_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
-# test_s_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
-test_s_r_CPPFLAGS = ${AM_CPPFLAGS}
-
-test_s_r_LDFLAGS = -static ${AM_LDFLAGS}
-# test_s_g_LDFLAGS = -static ${AM_LDFLAGS}
-
-
-# test_d_r_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
-# test_d_g_CFLAGS = ${PIPE}
-# 
-# test_d_r_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
-# test_d_g_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)
-
-test_d_r_SOURCES = $(testsources)
-# test_d_g_SOURCES = $(testsources)
-
-test_d_r_LDADD = -lkernel -lpolys -lcoeffs  -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lresources $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
-# test_d_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g  -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lresources_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
-
-# test_d_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
-# test_d_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
-test_d_r_CPPFLAGS = ${AM_CPPFLAGS}
-
-test_d_r_LDFLAGS = ${AM_LDFLAGS}
-# test_d_g_LDFLAGS = ${AM_LDFLAGS}
 
 # These files are built first