Changeset 60467b in git

Timestamp:

Mar 22, 2005, 2:52:39 PM (18 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

e99734cd84f61d25c9264fa4a9e9a851a3c0bd08

Parents:

1547c799300d38a5d4e07e991dd1354682ef4325

Message:

*levandov: plural targets for compatibility


git-svn-id: file:///usr/local/Singular/svn/trunk@7793 2c84dea3-7e68-4137-9b89-c4e89433aadc

Files:

• Makefile.in (modified) (5 diffs)
• Singular/Makefile.in (modified) (2 diffs)
• kernel/Makefile.in (modified) (1 diff)

Makefile.in

@@ -130 +130 @@
 
 BINDIST_DIRS    = kernel Singular doc IntegerProgramming
-PLU_BINDIST_DIRS = Singular doc
+PLU_BINDIST_DIRS =  ${BINDIST_DIRS}
 SHAREDIST_DIRS  = Singular doc emacs
-PLU_SHAREDIST_DIRS  = Singular doc emacs
+PLU_SHAREDIST_DIRS  = ${SHAREDIST_DIRS}
 TMPDIR          = ${TMP_DIR}/singdist
 
@@ -154 +154 @@
         done
 
+install-bindist-plural:
+        for DIR in ${PLU_BINDIST_DIRS}; \
+        do \
+          if test -d $${DIR}; then \
+            (cd $${DIR}; ${MAKE} install-bindist-plural install_prefix=${install_prefix});\
+          fi \
+        done
+
 install-sharedist: ${SINGULAR}
         for DIR in ${SHAREDIST_DIRS}; \
@@ -160 +168 @@
         done
 
-
-dist: ${SHAREDIST_NAME}.tgz  ${BINDIST_NAME}.tgz 
+install-sharedist-plural: ${SINGULAR}
+        for DIR in ${PLU_SHAREDIST_DIRS}; \
+        do \
+          (cd $${DIR}; ${MAKE} install-sharedist-plural install_prefix=${install_prefix}); \
+        done
+
+dist: ${SHAREDIST_NAME}.tar.gz  ${BINDIST_NAME}.tar.gz 
+
+dist-plural: ${PLU_SHAREDIST_NAME}.tar.gz  ${PLU_BINDIST_NAME}.tar.gz 
 
 sharedist ${SHAREDIST_NAME}.tar.gz:
@@ -171 +186 @@
         rm -rf ${TMPDIR}
 
+sharedist-plural ${PLU_SHAREDIST_NAME}.tar.gz:
+        if test -d ${TMPDIR}; then rm -rf ${TMPDIR}; fi
+        ${MAKE} install-sharedist-plural localdir=${TMPDIR}
+        chmod -R a+rX ${TMPDIR}
+        cd ${TMPDIR}; tar cf ${SHAREDIST_NAME}.tar Singular; ${MYGZIP} ${SHAREDIST_NAME}.tar
+        mv ${TMPDIR}/${SHAREDIST_NAME}.tar.gz .
+        rm -rf ${TMPDIR}
+
 bindist ${BINDIST_NAME}.tar.gz: 
         if test -d ${TMPDIR}; then rm -fr ${TMPDIR}; fi
@@ -182 +205 @@
         if test -d ${TMPDIR}; then rm -fr ${TMPDIR}; fi
         ${MAKE} install-bindist localdir=${TMPDIR} LD_STATIC=1
+        chmod -R a+rX ${TMPDIR}
+        cd ${TMPDIR}; tar cf ${BINDIST_NAME}-static.tar Singular; ${MYGZIP} ${BINDIST_NAME}-static.tar
+        mv ${TMPDIR}/${BINDIST_NAME}-static.tar.gz .
+        rm -rf ${TMPDIR}
+
+static-bindist-plural ${PLU_BINDIST_NAME}-static.tar.gz: 
+        if test -d ${TMPDIR}; then rm -fr ${TMPDIR}; fi
+        ${MAKE} install-bindist-plural localdir=${TMPDIR} LD_STATIC=1
         chmod -R a+rX ${TMPDIR}
         cd ${TMPDIR}; tar cf ${BINDIST_NAME}-static.tar Singular; ${MYGZIP} ${BINDIST_NAME}-static.tar

Singular/Makefile.in

@@ -224 +224 @@
  
 
-PLIBS = center.lib ncall.lib ncalg.lib ncdecomp.lib nctools.lib gkdim.lib qmatrix.lib
+PLIBS = center.lib gkdim.lib involution.lib ncall.lib ncalg.lib ncdecomp.lib nctools.lib qmatrix.lib
 
 ifdef HAVE_PLURAL
@@ -472 +472 @@
         echo "#undef MAKE_DISTRIBUTION " > distrib.h
 
+install-bindist-plural: install-bindist
+
+install-sharedist-plural: install-sharedist
+
 install-sharedist: ${SLIBS_FILES} LIB/gftables
         ${MKINSTALLDIRS} ${install_slibdir}

kernel/Makefile.in

@@ -330 +330 @@
 endif
 
+# compatibility
+
+install-bindist-plural: install-bindist
+
 ##
 ## clean targest