Changeset a708e0 in git


Ignore:
Timestamp:
Jun 28, 1997, 3:36:27 PM (26 years ago)
Author:
Olaf Bachmann <obachman@…>
Branches:
(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')
Children:
7adb5028d58cd523bb79d18cb12bbde01aa25097
Parents:
1b7361be01a867690a1c01be2ea56e9b571e5982
Message:
This commit was generated by cvs2svn to compensate for changes in r441,
which included commits to RCS files with non-trunk default branches.


git-svn-id: file:///usr/local/Singular/svn/trunk@442 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
MP
Files:
1 added
14 edited

Legend:

Unmodified
Added
Removed

  • MP/INSTALL

    r1b7361b ra708e0  
    4343
    4444  2. Type `make install' to compile and install the gmp, MP, and MPT
    45      libraries and header files. You can customize what is built and
    46      where the libraries and header files are installed by giving
    47      'configure' appropriate options (see below). NOTE: If you do not
    48      have the header file 'gmp.h' installed in a standard location on
    49      your system, then a './configure' followed by a simple 'make'
    50      command will fail. You need to do './configure --enable-gmp'
    51      followed by 'make install'.
     45     libraries and header files. The libraries will be installed in
     46     ./lib/<ARCH> where <ARCH> is an architecture-specific identifier
     47     (e.g., SUN4, SGI5).  Similarly, executables are installed in
     48     ./bin/<ARCH>.  You can customize what is built and where libraries,
     49     header files, and executables are installed by giving 'configure'
     50     appropriate options (see below). NOTE: If you do not have the header
     51     file 'gmp.h' installed in a standard location on your system, then
     52     a './configure' followed by a simple 'make' command will fail. You
     53     need to do './configure --enable-gmp' followed by 'make install'.
    5254
    5355  3. You can remove the program binaries and object files from the
    5456     source code directory by typing `make clean'.  To also remove the
    55      files that `configure' created (so you can compile the package
    56      for a different architecture), type `make distclean'.  There is
    57      also a `make maintainer-clean' target, but that is intended
    58      mainly for the package's developers.  If you use it, you may have
    59      to install all sorts of other programs in order to regenerate
    60      files that came with the distribution.
    61 
    62   4. Other make targets are:
     57     files that `configure' created, type `make distclean'.  There is
     58     a `make maintainer-clean' target, but that is intended mainly for
     59     the package's developers.  If you use it, you may have to install
     60     all sorts of other programs in order to regenerate files that came
     61     with the distribution.
     62
     63  4. To remake the library for a different architecture, login to the
     64     target machine and change directories to the MP source directory.
     65     You must remove the library object files and create new Makefiles.
     66     To do this, simply do a `make clean' in the top-level MP directory,
     67     followed by `rm config.cache' to remove the cache file created by
     68     configure.  Finally, rerun configure with the same options you gave
     69     it on other machines followed by a `make' or `make install'.
     70 
     71  5. Other make targets are:
    6372     'MP','libMP.a'   : Creates the MP library only.
    6473     'MPT','libMPT.a' : Creates the MPT library only.
    … …  
    128137          installed in the specified directories.
    129138
     139
    130140`--enable-PACKAGE' option where PACKAGE can be:
    131141
    132142  'examples' : The distribution comes with some example implementations
    133               contained in the directory 'examples'. By default, the
    134               examples are not built when MP is built. Use this option
    135               to build the examples together with MP. NOTE: Make sure
    136               that MP is installed before the examples are built. See
    137               also the README file contained in the 'examples'
    138               directory.
     143               contained in the directory 'examples'. By default, the
     144               examples are not built when MP is built. Use this option
     145               to build the examples when MP is built. NOTE: Make sure
     146               that MP is installed before the examples are built. Also
     147               see the README file contained in the 'examples' directory.
    139148
    140149  'mpviewer': The distribution comes with an mpviewer implementation
    141150              contained in the directory 'mpviewer'. By default, the
    142151              mpviewer is not built when MP is built. Use this option
    143               to build the mpviewer together with MP. NOTE: Make sure
    144               that MP is installed before the mpviewer is built. See
    145               also the README file contained in the 'mpviewer'
    146               directory.
    147 
    148   'mppvm' : The distribution comes with some pvm example
    149               implementations (demonstrating the use of the PVM
    150               transport device) contained in the directory
    151               'mp-pvm3'. By default, the pvm examples are not built
    152               when MP is build. Use this option to build the pvm
    153               examples together with MP. NOTE: Make sure that MP is
    154               installed before the examples are built. See also the
    155               README file contained in the 'mp-pvm3' directory.
     152              to build the mpviewer when MP is built. NOTE: Make sure
     153              that MP is installed before the mpviewer is built.  Also
     154              see the README file contained in the 'mpviewer' directory.
     155
     156  'mppvm' : The distribution comes with some pvm example implementations
     157            (demonstrating the use of the PVM transport device) contained
     158            in the directory 'mp-pvm3'. By default, the pvm examples are
     159            not built when MP is built. Use this option to build the pvm
     160            examples when MP is built. NOTE: Make sure that MP is installed
     161            before the examples are built. Also see the README file in the
     162            'mp-pvm3' directory.  If the pvm include files and libraries are
     163            not in standard places, you must be sure the PVM_ARCH and PVM_ROOT
     164            are set.  Note also that if you use this option, you must also
     165            use the `--with-pvm' option (see below).
    156166
    157167

  • MP/Makefile.in

    r1b7361b ra708e0  
    1515
    1616##
     17## various paths
     18##
     19prefix          = @prefix@
     20exec_prefix     = @exec_prefix@
     21includedir      = @includedir@
     22libdir          = @libdir@
     23
     24##
    1725## various programs
    1826##
    1927@SET_MAKE@
    2028CLEAN           = @CLEAN@
     29RANLIB          = ranlib
     30RANLIB_TEST = [ -f /usr/bin/ranlib -o -f /bin/ranlib ]
     31INSTALL         = ./install-sh -c
     32INSTALL_PROGRAM = ${INSTALL}
     33INSTALL_DATA    = ${INSTALL} -m 644
     34MKINSTALLDIRS   = ./mkinstalldirs
    2135
    2236##
    … …  
    3448        for SUBDIR in ${BUILD_SUBDIRS}; \
    3549        do \
    36                 echo ${MAKE} $@ in $${SUBDIR}; \
    37                 cd $${SUBDIR}; \
    38                 ${MAKE} $@; \
    39                 cd .. ;\
     50                if test "$${SUBDIR}" = gmp && test "$@" != all; then \
     51                        if test "$@" = install; then \
     52                                ${MAKE} installgmp; \
     53                        else \
     54                                ${MAKE} uninstallgmp; \
     55                        fi; \
     56                else \
     57                       echo ${MAKE} $@ in $${SUBDIR}; \
     58                        cd $${SUBDIR}; \
     59                        ${MAKE} $@; \
     60                        cd .. ;\
     61                fi; \
    4062        done
    4163
    … …  
    5375        distclean) ${CLEAN}; \
    5476               rm -rf Makefile config.status config.log config.cache TAGS* \
    55                       *.gz *.tar *.tgz lib include info;;\
     77                      *.gz *.tar *.tgz lib include info bin;;\
    5678        maintainer-clean) rm -f configure; ${CLEAN}; \
    5779               rm -rf Makefile config.status config.log config.cache TAGS* \
    … …  
    6486libMPT.a MPT : force
    6587        cd MPT; $(MAKE) all
     88
     89gmp/libgmp.a :
     90        cd gmp; $(MAKE) libgmp.a
     91
     92installgmp: gmp/libgmp.a
     93        ${MKINSTALLDIRS} ${libdir}
     94        ${MKINSTALLDIRS} ${includedir}
     95        $(INSTALL_DATA) gmp/libgmp.a ${libdir}
     96        if $(RANLIB_TEST) ; then $(RANLIB) $(libdir)/libgmp.a; else true; fi
     97        $(INSTALL_DATA) gmp/gmp.h $(includedir)
     98
     99uninstallgmp: force
     100        rm -f $(libdir)/libgmp.a $(includedir)/gmp.h
     101        - rmdir $(libdir) $(includedir)
    66102
    67103examples: force

  • MP/examples/Makefile.in

    r1b7361b ra708e0  
    1111prefix          = @prefix@
    1212exec_prefix     = @exec_prefix@
    13 libdir          = $(exec_prefix)/lib
     13libdir          = @libdir@
    1414includedir      = $(prefix)/include
     15bindir          = @bindir@
     16# MP sources and MP.h reside here
     17mp_srcdir       = ../MP
    1518BIGNUM_INCL     = $(prefix)/gmp
    1619
    … …  
    1821SHELL           = /bin/sh
    1922CFLAGS          = @CFLAGS@
     23CPPFLAGS        = -I. @CPPFLAGS@
    2024DEFS            = @DEFS@
    2125
    … …  
    2428LIBDIR          = $(libdir)
    2529
    26 CLEAN           = @CLEAN@  rm -f *.out
    27 
     30CLEAN           = @CLEAN@  rm -f *.out *.o
     31INSTALL         = ../install-sh -c
     32INSTALL_PROGRAM = ${INSTALL}
    2833
    2934COMPILE = $(CC) $(DEFS) -L$(LIBDIR) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
    … …  
    3742        send-vec recv-vec
    3843
    39 all:    mk-progs
     44all:    mk-bindir mk-progs
    4045
    41 install: mk-progs
     46install: mk-bindir mk-progs
     47
     48mk-bindir:
     49        $(top_srcdir)/mkinstalldirs $(bindir)
    4250
    4351mk-progs: $(PROGRAMS)
    … …  
    5058        rm -f Makefile
    5159
    52 gmptest : gmptest.c $(libdir)/libMP.a
     60
     61gmptest : gmptest.c
    5362        ${COMPILE} $@.c -o $@ $(LIBS)
     63        ${INSTALL} $@ ${bindir}
    5464
    55 client : client.c $(libdir)/libMP.a
     65client : client.c ${mp_srcdir}/libMP.a ${mp_srcdir}/MP.h ${mp_srcdir}/MP_Config.h
    5666        ${COMPILE} $@.c -o $@ $(LIBS)
     67        ${INSTALL} $@ ${bindir}
    5768
    58 server : server.c util $(libdir)/libMP.a
     69server : server.c util.o ${mp_srcdir}/libMP.a ${mp_srcdir}/MP.h ${mp_srcdir}/MP_Config.h
    5970        ${COMPILE} util.o $@.c -o $@ $(LIBS)
     71        ${INSTALL} $@ ${bindir}
    6072
    61 imp-client : imp-client.c $(libdir)/libMP.a
     73imp-client : imp-client.c ${mp_srcdir}/libMP.a ${mp_srcdir}/MP.h ${mp_srcdir}/MP_Config.h
    6274        ${COMPILE} $@.c -o $@ $(LIBS)
     75        ${INSTALL} $@ ${bindir}
    6376
    64 imp-server : imp-server.c util $(libdir)/libMP.a
     77imp-server : imp-server.c util.o ${mp_srcdir}/libMP.a ${mp_srcdir}/MP.h ${mp_srcdir}/MP_Config.h
    6578        ${COMPILE} util.o $@.c -o $@ $(LIBS)
     79        ${INSTALL} $@ ${bindir}
    6680
    67 send-tree : send-tree.c $(libdir)/libMP.a
     81send-tree : send-tree.c ${mp_srcdir}/libMP.a ${mp_srcdir}/MP.h ${mp_srcdir}/MP_Config.h
    6882        ${COMPILE} $@.c -o $@ $(LIBS)
     83        ${INSTALL} $@ ${bindir}
    6984
    70 recv-tree : recv-tree.c node util $(libdir)/libMP.a
     85recv-tree : recv-tree.c node.o util.o ${mp_srcdir}/libMP.a ${mp_srcdir}/MP_Config.h ${mp_srcdir}/MP.h
    7186        ${COMPILE} node.o util.o $@.c -o $@ $(LIBS)
     87        ${INSTALL} $@ ${bindir}
    7288
    73 send-vec : send-vec.c $(libdir)/libMP.a
     89send-vec : send-vec.c ${mp_srcdir}/libMP.a ${mp_srcdir}/MP.h ${mp_srcdir}/MP_Config.h
    7490        ${COMPILE} $@.c -o $@ $(LIBS)
     91        ${INSTALL} $@ ${bindir}
    7592
    76 recv-vec : recv-vec.c $(libdir)/libMP.a
     93recv-vec : recv-vec.c ${mp_srcdir}/libMP.a ${mp_srcdir}/MP.h ${mp_srcdir}/MP_Config.h
    7794        ${COMPILE} $@.c -o $@ $(LIBS)
     95        ${INSTALL} $@ ${bindir}
    7896
    79 node : node.c
    80         ${OBJCOMPILE} $(INCLUDES) $@.c
     97node.o :
     98        ${OBJCOMPILE} $(INCLUDES) node.c
    8199
    82 util : util.c
    83         ${OBJCOMPILE} $(INCLUDES) $@.c
     100util.o :
     101        ${OBJCOMPILE} $(INCLUDES)  util.c
     102
     103${mp_srcdir}/libMP.a:
     104        cd ${mp_srcdir}; ${MAKE} install
     105
     106${mp_srcdir}/MP.h:
     107        cd ${mp_srcdir}; ${MAKE} MP.h
     108
     109${mp_srcdir}/MP_Config.h:
     110        cd ${mp_srcdir}; ${MAKE} MP_Config.h
     111

  • MP/examples/gmptest.c

    r1b7361b ra708e0  
    88
    99#include <stdio.h>
    10 #include "MP.h"
     10/*#include "MP.h"*/
    1111#include  "gmp.h"
    1212

  • MP/mp-pvm3/Makefile.in

    r1b7361b ra708e0  
    8686        mv put-vec $(XDIR)
    8787
    88 master: master.c util
     88master: master.c util.o
    8989        ${COMPILE} util.o $@.c -o $@ $(LIBS)
    9090        mv master $(XDIR)
    … …  
    9494        mv put-tree $(XDIR)
    9595
    96 get-tree: get-tree.c util
     96get-tree: get-tree.c util.o
    9797        ${COMPILE} util.o $@.c -o $@ $(LIBS)
    9898        mv get-tree $(XDIR)
    … …  
    102102        mv mcast-put-tree $(XDIR)
    103103
    104 mcast-get-tree: mcast-get-tree.c  util
     104mcast-get-tree: mcast-get-tree.c  util.o
    105105        ${COMPILE} util.o $@.c -o $@ $(LIBS)
    106106        mv mcast-get-tree $(XDIR)
    … …  
    110110        mv slave $(XDIR)
    111111
    112 util : util.c
    113         ${OBJCOMPILE} $(INCLUDES) $@.c
     112util.o :
     113        ${OBJCOMPILE} $(INCLUDES) util.c
    114114

  • MP/mp-pvm3/get-tree.c

    r1b7361b ra708e0  
    1212#include "pvm3.h"
    1313#include "MP.h"
    14 #include "MP_PvmTransp.h"
    1514
    1615EXTERN MP_TranspOps_t pvm_ops;

  • MP/mp-pvm3/get-vec.c

    r1b7361b ra708e0  
    1414#include "pvm3.h"
    1515#include "MP.h"
    16 #include "MP_PvmTransp.h"
    1716
    1817EXTERN MP_TranspOps_t pvm_ops;

  • MP/mp-pvm3/master.c

    r1b7361b ra708e0  
    1717#include "pvm3.h"
    1818#include "MP.h"
    19 #include "MP_PvmTransp.h"
    2019
    2120#define ENCODING  PvmDataRaw

  • MP/mp-pvm3/mcast-get-tree.c

    r1b7361b ra708e0  
    1212#include "pvm3.h"
    1313#include "MP.h"
    14 #include "MP_PvmTransp.h"
    1514
    1615EXTERN MP_TranspOps_t pvm_ops;

  • MP/mp-pvm3/mcast-put-tree.c

    r1b7361b ra708e0  
    1414#include "gmp.h"
    1515#include "MP.h"
    16 #include "MP_PvmTransp.h"
    1716
    1817EXTERN MP_TranspOps_t pvm_ops;

  • MP/mp-pvm3/put-tree.c

    r1b7361b ra708e0  
    1212#include "gmp.h"
    1313#include "MP.h"
    14 #include "MP_PvmTransp.h"
    1514
    1615EXTERN MP_TranspOps_t pvm_ops;

  • MP/mp-pvm3/put-vec.c

    r1b7361b ra708e0  
    1010#include "pvm3.h"
    1111#include "MP.h"
    12 #include "MP_PvmTransp.h"
    1312
    1413EXTERN MP_TranspOps_t pvm_ops;

  • MP/mp-pvm3/slave.c

    r1b7361b ra708e0  
    1111#include "MP.h"
    1212#include "gmp.h"
    13 #include "MP_PvmTransp.h"
    1413
    1514#define ENCODING  PvmDataRaw

  • MP/mpviewer/Makefile.in

    r1b7361b ra708e0  
    88prefix          = @prefix@
    99exec_prefix     = @exec_prefix@
    10 libdir          = $(exec_prefix)/lib
     10libdir          = @libdir@
     11bindir          = @bindir@
    1112includedir      = $(prefix)/include
    1213
    … …  
    1415SHELL           = /bin/sh
    1516CFLAGS          = @CFLAGS@
     17CPPFLAGS        = -I. @CPPFLAGS@
    1618
    1719INCLUDES        = -I$(includedir)
    … …  
    2022
    2123CLEAN           = @CLEAN@
     24INSTALL         = ../install-sh -c
     25INSTALL_PROGRAM = ${INSTALL}
    2226
    2327
    … …  
    2832
    2933.c.o:
    30         ${CC} $(INCLUDES) ${CFLAGS} ${DEFS} -c $<
     34        ${CC} $(INCLUDES) ${CFLAGS} ${CPPFLAGS} ${DEFS} -c $<
    3135
    3236HEADER =  label.h  leaf.h node.h  ${prefix}/include/MP.h
    … …  
    4044all: mpview
    4145
    42 install: mpview
     46install: mk-bindir mpview
     47        ${INSTALL_PROGRAM} mpview ${bindir}
     48
     49mk-bindir:
     50        ${top_srcdir}/mkinstalldirs ${bindir}
     51
    4352
    4453mpview: ${OBJ}
Note: See TracChangeset for help on using the changeset viewer.