Changeset 9d9df3 in git

Timestamp:

Dec 20, 2011, 9:03:27 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

79d39d6c5087cc235a32018f8c1c6f64fcaa7758

Parents:

a3df16e27d36a9f1be3447d202a10a676ccd638f

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-12-20 21:03:27+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-01-06 21:09:34+01:00

Message:

build libfac at the correct (build) location

FIX: building libfac correctly

Files:

• Singular/extra.cc (modified) (1 diff)
• factory/Makefile.am (modified) (3 diffs)

Singular/extra.cc

@@ -155 +155 @@
 #define SI_DONT_HAVE_GLOBAL_VARS
 
-////// #include <libfac/factor.h> //////?????
+#ifdef HAVE_LIBFAC
+//#include <factory/libfac/factor.h>
+#endif
 
 #include <polys/clapconv.h>

factory/Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I ../m4
 
-SUBDIRS=include/factory libfac
-
-CXXTEMPLFLAGS      =  ## -fno-implicit-templates
+PACKAGES=include/factory libfac
+SUBDIRS=$(PACKAGES)
+
+CXXTEMPLFLAGS=
+## -fno-implicit-templates
 
 AM_CPPFLAGS = -I${builddir}/include -I${srcdir}/include ${GMP_CFLAGS} ${NTL_CFLAGS}
 
+AM_LDFLAGS =  -L${builddir} -L${builddir}/libfac
+
 lib_LTLIBRARIES = libfactory.la libfactory_g.la
 
 libfactory_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${CXXTEMPLFLAGS}
-libfactory_la_LIBADD     = ${abs_top_builddir}/libfac/libfac.la ${GMP_LIBS} ${NTL_LIBS}
+libfactory_la_LIBADD     = libfac/libfac.la ${GMP_LIBS} ${NTL_LIBS}
 libfactory_la_LDFLAGS    = -release ${PACKAGE_VERSION}
 libfactory_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${CXXTEMPLFLAGS}
-libfactory_g_la_LIBADD   = ${abs_top_builddir}/libfac/libfac_g.la ${GMP_LIBS} ${NTL_LIBS}
+libfactory_g_la_LIBADD   = libfac/libfac_g.la ${GMP_LIBS} ${NTL_LIBS}
 libfactory_g_la_LDFLAGS  = -release ${PACKAGE_VERSION}
 
@@ -294 +298 @@
                 examples/factorize.cc examples/gcd.cc \
                 bin/folding.el bin/fold-docu.el \
-                bin/makeheader bin/gen-readcf readcf.yy libfac
+                bin/makeheader bin/gen-readcf readcf.yy
 
 ##################################################
@@ -339 +343 @@
 test_s_r_CFLAGS = -O3 -fomit-frame-pointer 
 #ftmpl_inst.o
-test_s_r_LDADD = -L${builddir} -lfactory $(GMP_LIBS) $(NTL_LIBS)
-
-test_s_r_LDFLAGS = -static
-test_s_g_LDFLAGS = -static
-
-
+test_s_r_LDADD = -lfactory $(GMP_LIBS) $(NTL_LIBS)
+
+test_s_r_LDFLAGS = -static ${AM_LDFLAGS}
+test_s_g_LDFLAGS = -static ${AM_LDFLAGS}
 
 test_d_g_SOURCES = $(TESTSSOURCES)