Changeset 584f6b0 in git

Timestamp:

Nov 18, 2011, 11:23:29 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

7c5f743b68553cca4e94e8bb13bce5ee53897a77

Parents:

99fc2ebe6e27a966ceebe74c65bddedf98d82275

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-18 23:23:29+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-19 03:27:47+01:00

Message:

ADD/FIX: up-to-date {libsingular/libpolys}-config!
CHG: standalone.test/mk uses libsingular-config

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• libpolys/libpolys-config.in (modified) (2 diffs)
• libsingular-config.in (added)
• standalone.test/mk (modified) (1 diff)

Makefile.am

@@ -17 +17 @@
 # libfac doesn't use automake, just include it all in tarball
 EXTRA_DIST = libfac autogen.sh
+
+bin_SCRIPTS = libsingular-config

configure.ac

@@ -94 +94 @@
 AC_CONFIG_FILES([numeric/Makefile])
 AC_CONFIG_FILES([Singular/Makefile])
+AC_CONFIG_FILES([libsingular-config])
 
 AC_OUTPUT

libpolys/libpolys-config.in

@@ -17 +17 @@
 
   --prefix              show libpolys installation prefix 
+  --libsg               print library linking information (with debug)
+  --cflagsg             print pre-processor and compiler flags (with debug)
   --libs                print library linking information
   --cflags              print pre-processor and compiler flags
@@ -58 +60 @@
         ;;
 
+    --cflagsg)
+        ${ECHOn} " -I${includedir} -I${includedir}/singular @FACTORY_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@"
+        ;;
+
     --cflags)
-        ${ECHOn} " -I${includedir} -I${includedir}/libpolys @FACTORY_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@"
+        ${ECHOn} " -I${includedir} -I${includedir}/singular @FACTORY_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@ -DNDEBUG -DOM_NDEBUG"
+        ;;
+
+    --libsg)
+        ${ECHOn} " -L${libdir} -L${libdir}/singular -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g @FACTORY_LIBS@ -lomalloc_g @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@" 
         ;;
 
     --libs)
-        ${ECHOn} " -L${libdir} -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g @FACTORY_LIBS@ -lomalloc_g @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@" 
+        ${ECHOn} " -L${libdir} -L${libdir}/singular -lpolys -lcoeffs -lresources -lreporter -lmisc @FACTORY_LIBS@ -lomalloc @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@" 
         ;;
 

standalone.test/mk

@@ -10 +10 @@
 NAME="test"
 
-LIBPOLYSCFLAGS="`sh libpolys-config --cflags` -g -Wextra -Wall -Wno-long-long  -O0 --no-exceptions"
-LIBPOLYSLIBS=`sh libpolys-config --libs`
-LIBPOLYSPREFIX=`sh libpolys-config --prefix`
+P="." 
+# /mnt/DATA/GITHUB/w/GAP/libsing/spielwiese/TARGET/bin"
+
+LIBPOLYSCFLAGS="`sh $P/libsingular-config --cflagsg` -g -Wextra -Wall -Wno-long-long  -O0 --no-exceptions"
+LIBPOLYSLIBS=`sh $P/libsingular-config --libsg`
+LIBPOLYSPREFIX="`sh $P/libsingular-config --prefix`"
 
 echo "Using libpolys from: '$LIBPOLYSPREFIX'"