Changeset b773c0 in git

Timestamp:

Jan 11, 2013, 12:24:02 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

c251308665e937dc7f552d6681c2010dcdf1debb

Parents:

484a08c08ac3762652a83dd7b3651dbf06125695

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-01-11 12:24:02+01:00

git-committer:

Oleksandr Motsak <http://goo.gl/mcpzY>2013-01-11 14:47:15+01:00

Message:

Making Singular usable in builddir (without 'make install')

Location:

Singular

Files:

• Makefile.am (modified) (4 diffs)
• make_alllib.sh (modified) (1 diff)

Singular/Makefile.am

@@ -208 +208 @@
 endif
 
+Singular Singularg ESingular TSingular $(optional_Singular_programs): ${abs_builddir}/LIB
+
 AMLDFLAGS = -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel -L${top_builddir}/libpolys/polys  -L${top_builddir}/libpolys/coeffs -L${top_builddir}/libpolys/reporter -L${top_builddir}/libpolys/misc $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/findexec
 
@@ -298 +300 @@
 singularlibrarydir = ${datadir}/singular
 singularlibrary = $(SLIB0:%=LIB/%) $(SLIB1:%=LIB/%) $(PLIBS:%=LIB/%)
-nobase_dist_singularlibrary_DATA = LIB/all.lib LIB/tst.lib LIB/help.cnf ${singularlibrary}
+nobase_dist_singularlibrary_DATA = LIB/tst.lib LIB/help.cnf ${singularlibrary}
 EXTRA_DIST = make_alllib.sh LIB/all.lib.tmpl singular-libs LIB/help.cnf
 
 # ${nobase_dist_singularlibrary_DATA}
 
-LIB/all.lib: ${srcdir}/make_alllib.sh ${srcdir}/LIB/all.lib.tmpl ${singularlibrary}
-        $(MKDIR_P) LIB
+singularalllibrarydir = ${datadir}/singular/LIB
+singularalllibrary = all.lib
+nobase_dist_singularalllibrary_DATA = all.lib
+
+all.lib: ${srcdir}/make_alllib.sh ${srcdir}/LIB/all.lib.tmpl ${singularlibrary}
         ${srcdir}/make_alllib.sh ${srcdir}/LIB/all.lib.tmpl ${SLIB0} ${PLIBS}
-
-# [ -d ${builddir}/LIB ] || ( $(MKDIR_P) LIB ; cp ${srcdir}/LIB/*.lib ${builddir}/LIB/ )
 
 ########################### TEST #########################
@@ -365 +368 @@
 
 # These files are built first
-BUILT_SOURCES = feOpt.inc feOptTS.inc feOptES.inc iparith.inc LIB/all.lib plural_cmd.inc \
-                gftables MOD
+BUILT_SOURCES = feOpt.inc feOptTS.inc feOptES.inc iparith.inc all.lib plural_cmd.inc \
+                gftables MOD 
 
 CLEANFILES = $(BUILT_SOURCES) $(EXTRA_PROGRAMS)
 
+clean-local:
+        [ -L ${abs_builddir}/LIB ] && unlink ${abs_builddir}/LIB
+                  
 feOpt.inc: feOptGen
         ${builddir}/feOptGen
@@ -388 +394 @@
 gftables: ${top_srcdir}/factory/gftables
         ln -snf ${top_srcdir}/factory/gftables ${builddir}/gftables
+
+${abs_builddir}/LIB: ${srcdir}/LIB
+        ln -sn ${abs_srcdir}/LIB ${abs_builddir}/
 
 MOD: ${top_builddir}/libpolys/polys/.libs

Singular/make_alllib.sh

@@ -1 +1 @@
 #!/bin/sh
-cp $1 LIB/all.lib.n
-chmod u+rw LIB/all.lib.n
+#C="$1"
+#C=`readlink -f "$C"`
+#C=`dirname "$C"`
+#C=`ls -d1 "$C"`
+
+cp $1 all.lib.n
+chmod u+rw all.lib.n
 shift
 for i in $*
 do
-        echo "LIB \"$i\";" >>LIB/all.lib.n
+        echo "LIB \"$i\";" >> all.lib.n
 done
-chmod u-w LIB/all.lib.n
-mv -f LIB/all.lib.n LIB/all.lib
+#       [ ! -e "$i" ] && (cp -nv "$C/$i" .)
+chmod u-w all.lib.n
+mv -f all.lib.n all.lib