Changeset 9d9df3 in git


Ignore:
Timestamp:
Dec 20, 2011, 9:03:27 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '52dcfddee5ec87d404d5e0fb44f2d627608208f1')
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:
2 edited

Legend:

Unmodified
Added
Removed
  • Singular/extra.cc

    ra3df16e r9d9df3  
    155155#define SI_DONT_HAVE_GLOBAL_VARS
    156156
    157 ////// #include <libfac/factor.h> //////?????
     157#ifdef HAVE_LIBFAC
     158//#include <factory/libfac/factor.h>
     159#endif
    158160
    159161#include <polys/clapconv.h>
  • factory/Makefile.am

    ra3df16e r9d9df3  
    11ACLOCAL_AMFLAGS = -I ../m4
    22
    3 SUBDIRS=include/factory libfac
    4 
    5 CXXTEMPLFLAGS      =  ## -fno-implicit-templates
     3PACKAGES=include/factory libfac
     4SUBDIRS=$(PACKAGES)
     5
     6CXXTEMPLFLAGS=
     7## -fno-implicit-templates
    68
    79AM_CPPFLAGS = -I${builddir}/include -I${srcdir}/include ${GMP_CFLAGS} ${NTL_CFLAGS}
    810
     11AM_LDFLAGS =  -L${builddir} -L${builddir}/libfac
     12
    913lib_LTLIBRARIES = libfactory.la libfactory_g.la
    1014
    1115libfactory_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${CXXTEMPLFLAGS}
    12 libfactory_la_LIBADD     = ${abs_top_builddir}/libfac/libfac.la ${GMP_LIBS} ${NTL_LIBS}
     16libfactory_la_LIBADD     = libfac/libfac.la ${GMP_LIBS} ${NTL_LIBS}
    1317libfactory_la_LDFLAGS    = -release ${PACKAGE_VERSION}
    1418libfactory_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${CXXTEMPLFLAGS}
    15 libfactory_g_la_LIBADD   = ${abs_top_builddir}/libfac/libfac_g.la ${GMP_LIBS} ${NTL_LIBS}
     19libfactory_g_la_LIBADD   = libfac/libfac_g.la ${GMP_LIBS} ${NTL_LIBS}
    1620libfactory_g_la_LDFLAGS  = -release ${PACKAGE_VERSION}
    1721
     
    294298                examples/factorize.cc examples/gcd.cc \
    295299                bin/folding.el bin/fold-docu.el \
    296                 bin/makeheader bin/gen-readcf readcf.yy libfac
     300                bin/makeheader bin/gen-readcf readcf.yy
    297301
    298302##################################################
     
    339343test_s_r_CFLAGS = -O3 -fomit-frame-pointer
    340344#ftmpl_inst.o
    341 test_s_r_LDADD = -L${builddir} -lfactory $(GMP_LIBS) $(NTL_LIBS)
    342 
    343 test_s_r_LDFLAGS = -static
    344 test_s_g_LDFLAGS = -static
    345 
    346 
     345test_s_r_LDADD = -lfactory $(GMP_LIBS) $(NTL_LIBS)
     346
     347test_s_r_LDFLAGS = -static ${AM_LDFLAGS}
     348test_s_g_LDFLAGS = -static ${AM_LDFLAGS}
    347349
    348350test_d_g_SOURCES = $(TESTSSOURCES)
Note: See TracChangeset for help on using the changeset viewer.