Changeset 9f524d in git for libpolys/tests

Timestamp:

Mar 29, 2012, 2:28:08 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3b8a6e5e24ae48e883cb2e56532dd3352241948b

Parents:

4bc0ab9a99c6b2bc95e41d5541864a736e382642

Message:

reverted library packing with LIBADD

chg: correct _LDADD
chg: no use of LIBADD in libcoeffs & libpolys
chg: install all of libmisc, libreporter, libcoeffs & libpolys

NOTE: coeffs & polys should not pack libmisc & libreporter since it causes usage problems for shared libs from an installed package

File:

• libpolys/tests/Makefile.am (modified) (3 diffs)

libpolys/tests/Makefile.am

@@ -1 +1 @@
 CXXTEMPLFLAGS = -O0 ##  ## -fno-implicit-templates
-
-if ENABLE_FACTORY
-  USE_FACTORY = -L${top_builddir}/../factory
-else
-  USE_FACTORY =
-endif
-
-
 
 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 ${FACTORY_CFLAGS} ${GMP_CFLAGS} ${NTL_CFLAGS} 
@@ -99 +91 @@
 rings_test_s_g_CPPFLAGS = ${DEBUGCPPFLAGS}
 
+
+if ENABLE_FACTORY
+  USE_FACTORY = -L${top_builddir}/../factory
+else
+  USE_FACTORY =
+endif
+
 AM_LDFLAGS = -L${top_builddir}/polys -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${top_builddir}/../findexec
+
 
 coeffs_test_s_r_LDFLAGS = ${AM_LDFLAGS} -static 
@@ -119 +119 @@
 
 coeffs_test_s_r_LDADD = -lcoeffs -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS} 
-polys_test_s_r_LDADD = -lpolys ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS} 
+polys_test_s_r_LDADD = -lpolys -lcoeffs -lreporter -lmisc ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS} 
 rings_test_s_r_LDADD = $(polys_test_s_r_LDADD)
 
 coeffs_test_s_g_LDADD = -lcoeffs_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS} 
-polys_test_s_g_LDADD = -lpolys_g ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS} 
+polys_test_s_g_LDADD = -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS} 
 rings_test_s_g_LDADD = $(polys_test_s_g_LDADD)
 
 coeffs_test_d_r_LDADD = -lcoeffs -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS} 
-polys_test_d_r_LDADD = -lpolys ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
+polys_test_d_r_LDADD = -lpolys -lcoeffs -lreporter -lmisc ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
 rings_test_d_r_LDADD = $(polys_test_d_r_LDADD)
 
 coeffs_test_d_g_LDADD = -lcoeffs_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS} 
-polys_test_d_g_LDADD = -lpolys_g ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
+polys_test_d_g_LDADD = -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
 rings_test_d_g_LDADD = $(polys_test_d_g_LDADD)