Changeset 991aba2 in git


Ignore:
Timestamp:
Jun 22, 2017, 10:16:36 AM (7 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '60097d763e0b541617a3b864b5310c523edaf81d')
Children:
bf7809212b8904fc8eb7aeae955ed48bd4c2c911
Parents:
6659b8184fd602de4fa33a5fac2b6b3d38cb4575
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2017-06-22 10:16:36+02:00
git-committer:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2017-06-22 10:17:26+02:00
Message:
fix: module build
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • Singular/dyn_modules/Makefile.am

    r6659b8 r991aba2  
    11ACLOCAL_AMFLAGS = -I ../m4
    22
    3 SUBDIRS=staticdemo bigintm syzextra pyobject customstd gfanlib python gitfan polymake singmathic Order
     3SUBDIRS=staticdemo bigintm syzextra pyobject customstd gfanlib python gitfan polymake singmathic Order interval
  • Singular/dyn_modules/interval/Makefile.am

    r6659b8 r991aba2  
    1 OS := $(shell uname)
     1ACLOCAL_AMFLAGS = -I ../../m4
    22
    3 CC = /usr/bin/gcc
    4 ALL = interval.so
    5 ifeq ($(OS),Darwin)
    6         All += interval.so interval.o
     3MYINCLUDES =  -I${top_srcdir} -I${top_builddir} \
     4-I${top_srcdir}/libpolys -I${top_builddir}/libpolys \
     5$(FACTORY_INCLUDES) $(RESOURCES_INCLUDES) $(OMALLOC_INCLUDES) \
     6$(FLINT_CFLAGS) $(NTL_CPPFLAGS) $(GMP_CPPFLAGS) $(GOOGLE_PERFTOOLS_CFLAGS)
     7
     8if SI_BUILTIN_INTERVAL
     9  noinst_LTLIBRARIES=interval.la
     10  P_PROCS_CPPFLAGS_COMMON = -DSTATIC_VERSION
     11  P_PROCS_MODULE_LDFLAGS = -module
     12else
     13  module_LTLIBRARIES=interval.la
     14  moduledir = $(libexecdir)/singular/MOD
     15  P_PROCS_CPPFLAGS_COMMON = -DDYNAMIC_VERSION
     16# Add under Mac OS X: -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
     17  P_PROCS_MODULE_LDFLAGS = -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
    718endif
    819
    9 .PHONY = all
     20SOURCES = interval.cc interval.h
     21interval_la_SOURCES   = $(SOURCES)
     22interval_la_CPPFLAGS  = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
     23interval_la_LDFLAGS   = ${AM_LDFLAGS} ${P_PROCS_MODULE_LDFLAGS} ${GOOGLE_PERFTOOL_LDFLAGS} $(SINGULAR_LDFLAGS)
     24if SING_WIN
     25if !SI_BUILTIN_INTERVAL
     26interval_la_LIBADD    = ${top_builddir}/Singular/libSingular.la
     27endif
     28endif
    1029
    11 all: $(ALL)
    12 
    13 clean:
    14         rm -v $(ALL)
    15 
    16 ifeq ($(OS),Linux)
    17 interval.so: interval.cc interval.h
    18         $(CC) -shared -DDYNAMIC_VERSION -fPIC `libsingular-config --cflags` $< -o $@
    19 else
    20 interval.so: interval.o
    21         libtool -dynamic -twolevel_namespace -weak_reference_mismatches weak -undefined dynamic_lookup -o $@ $^
    22 
    23 interval.o: interval.cc interval.h
    24         $(CC) -shared -DDYNAMIC_VERSION -fPIC `libsingular-config --cflags` -O -c $< -o $@
    25 endif
  • configure.ac

    r6659b8 r991aba2  
    245245AC_CONFIG_FILES([Singular/dyn_modules/staticdemo/Makefile])
    246246AC_CONFIG_FILES([Singular/dyn_modules/gitfan/Makefile])
     247AC_CONFIG_FILES([Singular/dyn_modules/interval/Makefile])
    247248
    248249AC_CONFIG_FILES([Singular/Makefile])
  • m4/options.m4

    r6659b8 r991aba2  
    325325  bi_Order=false
    326326  bi_gitfan=false
     327  bi_interval=false
    327328
    328329
     
    358359       Order ) bi_Order=true ;;
    359360       gitfan ) bi_gitfan=true ;;
     361       interval ) bi_interval=true ;;
    360362      esac
    361363
     
    395397 AM_CONDITIONAL([SI_BUILTIN_ORDER], [test x$bi_Order = xtrue])
    396398 AM_CONDITIONAL([SI_BUILTIN_GITFAN], [test x$bi_gitfan = xtrue])
     399 AM_CONDITIONAL([SI_BUILTIN_INTERVAL], [test x$bi_interval = xtrue])
    397400
    398401 AC_MSG_CHECKING([BUILTIN_LIBS...])
Note: See TracChangeset for help on using the changeset viewer.