Changeset dc7ba4 in git

Timestamp:

May 8, 2014, 6:46:27 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

f6d7904b37d591229fb79d7b510e9b82d9bee898

Parents:

af87fd0ccfda4649a0cc8d2cc6315b48cd069e78

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-05-08 18:46:27+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-05-26 18:59:32+02:00

Message:

Update/cleanup for modules: polymake & gfanlib

Location:

Singular/dyn_modules

Files:

• callgfanlib/Makefile.am (modified) (2 diffs)
• callpolymake/Makefile.am (modified) (1 diff)

Singular/dyn_modules/callgfanlib/Makefile.am

@@ -3 +3 @@
 SOURCES = bbcone.cc bbcone.h bbfan.cc bbfan.h bbpolytope.cc bbpolytope.h gfan.h gitfan.cc gitfan.h gfanlib.cc
 
-MYINCLUDES =  -I${top_srcdir} -I${top_builddir} \
+AM_CPPFLAGS =  -I${top_srcdir} -I${top_builddir} \
 -I${top_srcdir}/libpolys -I${top_builddir}/libpolys \
 ${FACTORY_INCLUDES} ${RESOURCES_INCLUDES} ${OMALLOC_INCLUDES} \
 ${FLINT_CFLAGS} ${NTL_CFLAGS} ${GMP_CFLAGS} 
 
-if HAVE_GFANLIB
-  module_LTLIBRARIES=gfanlib.la
-endif
+module_LTLIBRARIES=gfanlib.la
+
+#if HAVE_GFANLIB
+#### should be disabled in the source code
+#endif
 
 if ENABLE_P_PROCS_DYNAMIC
@@ -16 +18 @@
   P_PROCS_CPPFLAGS_COMMON = -DDYNAMIC_VERSION 
 # Add under Mac OS X: -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
+  P_PROCS_MODULE_LDFLAGS =  -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
 else
   moduledir = $(libdir)/singular
-  P_PROCS_CPPFLAGS_COMMON = -DSTATIC_VERSION 
+  P_PROCS_CPPFLAGS_COMMON = -DSTATIC_VERSION
+  P_PROCS_MODULE_LDFLAGS = -module -static
 endif
 
-P_PROCS_MODULE_LDFLAGS =  -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
+gfanlib_la_SOURCES  = $(SOURCES)
 
-gfanlib_la_SOURCES  = $(SOURCES)
-gfanlib_la_CPPFLAGS = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
+gfanlib_la_CPPFLAGS = ${AM_CPPFLAGS} ${P_PROCS_CPPFLAGS_COMMON}
 gfanlib_la_LDFLAGS  = ${AM_LDFLAGS} ${P_PROCS_MODULE_LDFLAGS}
 
 gfanlib_la_LIBADD   = ${abs_top_builddir}/gfanlib/libgfan.la ${CDDGMPLDFLAGS}
-#  ${abs_top_builddir}/gfanlib/libgfan.la ${CDDGMPLDFLAGS}
-
 
 #AM_COLOR_TESTS=always

Singular/dyn_modules/callpolymake/Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I ../../m4
 
-moduledir = $(libexecdir)/singular/MOD
+SOURCES = polymake_conversion.cc polymake_documentation.cc polymake_wrapper.cc
 
-if SING_HAVE_POLYMAKE
+AM_CPPFLAGS =  -I${top_srcdir} -I${top_builddir} \
+-I${top_srcdir}/libpolys -I${top_builddir}/libpolys \
+$(PM_INC) $(PM_CFLAGS) $(POLYMAKE_CXXFLAGS) \
+${FACTORY_INCLUDES} ${RESOURCES_INCLUDES} ${OMALLOC_INCLUDES} \
+${FLINT_CFLAGS} ${NTL_CFLAGS} ${GMP_CFLAGS} 
+
+module_LTLIBRARIES=polymake.la
+
+#if SING_HAVE_POLYMAKE
+#if ENABLE_P_PROCS_DYNAMIC
+##### should be disabled in the source code
+#endif
+#endif
+
 if ENABLE_P_PROCS_DYNAMIC
-  module_LTLIBRARIES=polymake.la
-endif
+  moduledir = $(libexecdir)/singular/MOD
+  P_PROCS_CPPFLAGS_COMMON = -DDYNAMIC_VERSION 
+  P_PROCS_MODULE_LDFLAGS =  -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
+# Add under Mac OS X: -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
+else
+  moduledir = $(libdir)/singular
+  P_PROCS_CPPFLAGS_COMMON = -DSTATIC_VERSION
+  P_PROCS_MODULE_LDFLAGS = -module -static
 endif
 
 # forcefully enable exceptions for polymake
-AM_LDFLAGS      = ${PM_LDFLAGS}
-# -release ${PACKAGE_VERSION}
-  
-SOURCES = polymake_conversion.cc polymake_documentation.cc polymake_wrapper.cc
-
 CXXFLAGS += $(POLYMAKE_CXXFLAGS)
 
 polymake_la_SOURCES = $(SOURCES)
 
-MYINCLUDES = -I${top_srcdir} -I${top_builddir} \
--I${top_srcdir}/libpolys -I${top_builddir}/libpolys  \
-$(PM_INC) $(PM_CFLAGS) $(POLYMAKE_CXXFLAGS) \
-$(FACTORY_INCLUDES) $(RESOURCES_INCLUDES) $(OMALLOC_INCLUDES) \
-$(FLINT_CFLAGS) $(NTL_CFLAGS) $(GMP_CFLAGS)
+polymake_la_CPPFLAGS = ${AM_CPPFLAGS} ${P_PROCS_CPPFLAGS_COMMON} ${POLYMAKE_CXXFLAGS}
+polymake_la_CXXFLAGS = ${POLYMAKE_CXXFLAGS}
+polymake_la_CFLAGS   = ${POLYMAKE_CXXFLAGS}
 
-P_PROCS_CPPFLAGS_COMMON = -DDYNAMIC_VERSION
-
-polymake_la_CPPFLAGS = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON} ${POLYMAKE_CXXFLAGS}
-polymake_la_CXXFLAGS = ${POLYMAKE_CXXFLAGS}
-polymake_la_CFLAGS = ${POLYMAKE_CXXFLAGS}
-
-if ENABLE_P_PROCS_DYNAMIC
-  P_PROCS_MODULE_LDFLAGS = ${AM_LDFLAGS} -shared -module
-else
-  P_PROCS_MODULE_LDFLAGS = ${AM_LDFLAGS}
-endif
-
-# Add under Mac OS X: -twolevel_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
-polymake_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
-polymake_la_LIBADD = ${PM_LIBS}
+polymake_la_LDFLAGS = ${PM_LDFLAGS} ${P_PROCS_MODULE_LDFLAGS}
+polymake_la_LIBADD  = ${PM_LIBS}