Changeset bf4bb5 in git

Timestamp:

Jul 28, 2014, 8:19:50 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4a51c16a6a1512db2a1cb23591e79de775516f76

Parents:

a5566a44ae4374bdbfa6b74b93ac55d70fb3ee33

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-07-28 20:19:50+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-07-28 20:51:02+02:00

Message:

Fix builting-in Order

File:

• Singular/dyn_modules/Order/Makefile.am (modified) (2 diffs)

Singular/dyn_modules/Order/Makefile.am

@@ -11 +11 @@
 $(FACTORY_CFLAGS) $(NTL_CFLAGS) $(GMP_CFLAGS) $(GOOGLE_PERFTOOLS_CFLAGS)
 
-module_LTLIBRARIES=Order.la 
-
-if ENABLE_P_PROCS_DYNAMIC
+if SI_BUILTIN_ORDER
+  noinst_LTLIBRARIES=Order.la
+  P_PROCS_CPPFLAGS_COMMON = -DSTATIC_VERSION 
+  P_PROCS_MODULE_LDFLAGS = -module
+else
+  module_LTLIBRARIES=Order.la
   moduledir = $(libexecdir)/singular/MOD
   P_PROCS_CPPFLAGS_COMMON = -DDYNAMIC_VERSION 
 # 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 -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
 endif
-
-P_PROCS_MODULE_LDFLAGS = -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
 
 Order_la_SOURCES   = $(SOURCES)
@@ -36 +35 @@
 # TESTS=test_release.sh
 #
-# EXTRA_DIST = nforder.tst ederc.tst test_clear_enum.tst test.sh $(TESTS)
+# EXTRA_DIST = nforder.tst test.sh $(TESTS)