Index: pvm-3.4.5/Makefile =================================================================== --- pvm-3.4.5.orig/Makefile +++ pvm-3.4.5/Makefile @@ -6,7 +6,7 @@ SHELL = /bin/sh -AIMKSTR = -here -f ./conf/`./debian/getpvmarch`.def -f ./Makefile.aimk +AIMKSTR = -here -f ./conf/`./debian/getpvmarch`.def -f ./Makefile.aimk CFLOPTS='' default: ./lib/aimk $(AIMKSTR) default @@ -51,3 +51,54 @@ x: r: ./lib/aimk $(AIMKSTR) r + + +# compile for /usr/local directories + +local: + ./lib/aimk $(AIMKSTR) CFLOPTS='"-O -DSAFETMP -DPVMDPATH=\\\"pvmd\\\" -DPVMDFILE=\\\"/usr/local/bin/pvmd\\\" -DPVM_DEFAULT_ROOT=\\\"/usr/local/lib/pvm3\\\" "' PVMDIR=`pwd` default + +# compile for system directories +system: + ./lib/aimk $(AIMKSTR) CFLOPTS='"-g -O2 -DSAFETMP -DPVMDPATH=\\\"pvmd\\\" -DPVMDFILE=\\\"/usr/bin/pvmd\\\" -DPVM_DEFAULT_ROOT=\\\"/usr/lib/pvm3\\\" "' PVMDIR=`pwd` default + + +install-local: + -mkdir -p /usr/local/lib/pvm3/lib /usr/local/lib/pvm3/bin \ + /usr/local/lib/pvm3/conf + cp lib/pvmgetarch lib/aimk /usr/local/lib/pvm3/lib + cp -pr lib/`./lib/pvmgetarch` /usr/local/lib/pvm3/lib + cp -pr bin/`./lib/pvmgetarch` /usr/local/lib/pvm3/bin + cp -pr include /usr/local/lib/pvm3/ + cp conf/`./lib/pvmgetarch`* /usr/local/lib/pvm3/conf + ln -sf /usr/local/lib/pvm3/lib/aimk /usr/local/bin + ln -sf /usr/local/lib/pvm3/lib/pvmgetarch /usr/local/bin + ln -sf /usr/local/lib/pvm3/lib/`./lib/pvmgetarch`/pvm /usr/local/bin + ln -sf /usr/local/lib/pvm3/lib/`./lib/pvmgetarch`/pvmgs /usr/local/bin + ln -sf /usr/local/lib/pvm3/lib/`./lib/pvmgetarch`/pvmd3 /usr/local/bin/pvmd + ln -sf /usr/local/lib/pvm3/lib/`./lib/pvmgetarch`/pvmd3 /usr/local/lib/pvm3/lib/pvmd + ln -sf /usr/local/lib/pvm3/lib/`./lib/pvmgetarch`/pvm /usr/local/lib/pvm3/lib/pvm + +install-deb: + -mkdir -p $(DESTDIR)/usr/lib/pvm3/lib $(DESTDIR)/usr/lib/pvm3/bin \ + $(DESTDIR)/usr/lib/pvm3/conf + cp lib/pvmgetarch lib/aimk $(DESTDIR)/usr/lib/pvm3/lib + cp -pr lib/`./lib/pvmgetarch` $(DESTDIR)/usr/lib/pvm3/lib + cp -pr bin/`./lib/pvmgetarch` $(DESTDIR)/usr/lib/pvm3/bin + cp conf/`./lib/pvmgetarch`* $(DESTDIR)/usr/lib/pvm3/conf + cp include/* $(DESTDIR)/usr/include + mv $(DESTDIR)/usr/lib/pvm3/lib/aimk $(DESTDIR)/usr/bin + mv $(DESTDIR)/usr/lib/pvm3/lib/pvmgetarch $(DESTDIR)/usr/bin + ln -sf ../../../bin/pvmgetarch $(DESTDIR)/usr/lib/pvm3/lib/pvmgetarch + mv $(DESTDIR)/usr/lib/pvm3/lib/`./lib/pvmgetarch`/pvm $(DESTDIR)/usr/bin + mv $(DESTDIR)/usr/lib/pvm3/lib/`./lib/pvmgetarch`/pvmgs $(DESTDIR)/usr/bin + mv $(DESTDIR)/usr/lib/pvm3/lib/`./lib/pvmgetarch`/pvmd3 $(DESTDIR)/usr/bin/pvmd + ln -sf ../../../bin/pvmd $(DESTDIR)/usr/lib/pvm3/lib/pvmd + ln -sf ../../../bin/pvm $(DESTDIR)/usr/lib/pvm3/lib/pvm + mv $(DESTDIR)/usr/lib/pvm3/lib/`./lib/pvmgetarch`/*.a $(DESTDIR)/usr/lib + mv $(DESTDIR)/usr/lib/pvm3/bin/`./lib/pvmgetarch`/* $(DESTDIR)/usr/bin +# cp -r man/man1 $(DESTDIR)/usr/man +# cp -r man/man3 $(DESTDIR)/usr/man + tar cf - examples | gzip -9 > $(DESTDIR)/usr/share/doc/pvm-dev/examples.tar.gz + tar cf - gexamples | gzip -9 > $(DESTDIR)/usr/share/doc/pvm-dev/gexamples.tar.gz + Index: pvm-3.4.5/Makefile.aimk =================================================================== --- pvm-3.4.5.orig/Makefile.aimk +++ pvm-3.4.5/Makefile.aimk @@ -34,10 +34,9 @@ SHELL = /bin/sh # PVMOPTS = CC="$(CC)" \ - F77="$(F77)" - -# CFLOPTS="$(CFLOPTS)" -# FFLOPTS="$(FFLOPTS)" + F77=$(F77) \ + CFLOPTS=$(CFLOPTS) + FFLOPTS=$(FFLOPTS) # PVMDIR=$(PVMDIR) # Index: pvm-3.4.5/console/Makefile.aimk =================================================================== --- pvm-3.4.5.orig/console/Makefile.aimk +++ pvm-3.4.5/console/Makefile.aimk @@ -22,8 +22,8 @@ TRCLIB = pvmtrc LIBPREFIX = lib PVMLIBDEP = $(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).a TRCLIBDEP = $(TRCLDIR)/$(LIBPREFIX)$(TRCLIB).a -CFLAGS = $(CFLOPTS) -DIMA_$(PVM_ARCH) -I$(PVMIDIR) -I$(TRCIDIR) \ - -I$(PVMSDIR) $(ARCHCFLAGS) +CFLAGS = $(ARCHCFLAGS) $(CFLOPTS) -DIMA_$(PVM_ARCH) -I$(PVMIDIR) -I$(TRCIDIR) \ + -I$(PVMSDIR) LIBS = $(LOPT) -L$(TRCLDIR) -L$(PVMLDIR) \ -l$(TRCLIB) -l$(PVMLIB) $(ARCHLIB) OBJ = cons.o cmds.o job.o trc.o Index: pvm-3.4.5/examples/Makefile.aimk =================================================================== --- pvm-3.4.5.orig/examples/Makefile.aimk +++ pvm-3.4.5/examples/Makefile.aimk @@ -25,7 +25,7 @@ BDIR = $(PVMDIR)/bin XDIR = $(BDIR)/$(PVM_ARCH) CFLOPTS = -g -CFLAGS = $(CFLOPTS) -I$(PVMDIR)/include $(ARCHCFLAGS) +CFLAGS = $(ARCHCFLAGS) $(CFLOPTS) -I$(PVMDIR)/include ##### Need to select some architecture-specific libraries to link tasks # The default setup is for workstations Index: pvm-3.4.5/gexamples/Makefile.aimk =================================================================== --- pvm-3.4.5.orig/gexamples/Makefile.aimk +++ pvm-3.4.5/gexamples/Makefile.aimk @@ -23,7 +23,7 @@ PVMIDIR = $(PVMDIR)/include PVMLDIR = $(PVMDIR)/lib/$(PVM_ARCH) PVMLIB = $(LOPT) -L$(PVMLDIR) -lgpvm3 -lpvm3 $(ARCHLIB) CFLOPTS = -g -CFLAGS = $(CFLOPTS) -I$(PVMIDIR) $(ARCHCFLAGS) +CFLAGS = $(ARCHCFLAGS) $(CFLOPTS) -I$(PVMIDIR) SDIR = $(PVMDIR)/gexamples BDIR = $(PVMDIR)/bin XDIR = $(BDIR)/$(PVM_ARCH) Index: pvm-3.4.5/hoster/Makefile.aimk =================================================================== --- pvm-3.4.5.orig/hoster/Makefile.aimk +++ pvm-3.4.5/hoster/Makefile.aimk @@ -21,8 +21,7 @@ BDIR = $(PVMDIR)/bin XDIR = $(BDIR)/$(PVM_ARCH) CFLOPTS = -O -CFLAGS = $(CFLOPTS) -I$(PVMIDIR) -I$(PVMSDIR) -DIMA_$(PVM_ARCH) \ - $(ARCHCFLAGS) +CFLAGS = $(ARCHCFLAGS) $(CFLOPTS) -I$(PVMIDIR) -I$(PVMSDIR) -DIMA_$(PVM_ARCH) LIBS = -L$(PVMLDIR) -l$(PVMLIB) $(ARCHLIB) HEADERS = $(PVMIDIR)/pvm3.h $(PVMIDIR)/pvmproto.h Index: pvm-3.4.5/libfpvm/Makefile.aimk =================================================================== --- pvm-3.4.5.orig/libfpvm/Makefile.aimk +++ pvm-3.4.5/libfpvm/Makefile.aimk @@ -9,9 +9,9 @@ SHELL = /bin/sh PVMDIR = ../.. SDIR = $(PVMDIR)/libfpvm -CFLAGS = $(CFLOPTS) -c -DIMA_$(PVM_ARCH) \ +CFLAGS = $(ARCHCFLAGS) $(CFLOPTS) -c -DIMA_$(PVM_ARCH) \ -I$(SDIR) -I$(PVMDIR)/include -I$(PVMDIR)/src \ - $(CDEBUGFLAGS) $(ARCHCFLAGS) + $(CDEBUGFLAGS) RM = rm -f M4 = m4 M4FILE = $(PVMDIR)/conf/$(PVM_ARCH).m4 Index: pvm-3.4.5/pvmgs/Makefile.aimk =================================================================== --- pvm-3.4.5.orig/pvmgs/Makefile.aimk +++ pvm-3.4.5/pvmgs/Makefile.aimk @@ -32,8 +32,7 @@ PVMLIBDEP = $(PVMLDIR)/$(LIBPREFIX)$(PVM # server requests, where XXX is the number of seconds for the timeout. # (Note: this flag can also be added to the ARCHCFLAGS define in the # PVM conf file, i.e.: $PVM_ROOT/conf/$PVM_ARCH.def ) -CFLAGS = $(CFLOPTS) -I$(PVMIDIR) -I$(PVMSDIR) -DIMA_$(PVM_ARCH) \ - $(ARCHCFLAGS) +CFLAGS = $(ARCHCFLAGS) $(CFLOPTS) -I$(PVMIDIR) -I$(PVMSDIR) -DIMA_$(PVM_ARCH) LIBS = $(LOPT) -L$(PVMLDIR) -l$(PVMLIB) $(ARCHLIB) Index: pvm-3.4.5/rm/Makefile.aimk =================================================================== --- pvm-3.4.5.orig/rm/Makefile.aimk +++ pvm-3.4.5/rm/Makefile.aimk @@ -26,9 +26,8 @@ BDIR = $(PVMDIR)/bin XDIR = $(BDIR)/$(PVM_ARCH) CFLOPTS = -g -CFLAGS = $(CFLOPTS) -I$(PVMIDIR) $(ARCHCFLAGS) \ - -DIMA_$(PVM_ARCH) $(ARCHCFLAGS) \ - $(DEBUG_FLAGS) +CFLAGS = $(ARCHCFLAGS) $(CFLOPTS) -I$(PVMIDIR) $(ARCHCFLAGS) \ + -DIMA_$(PVM_ARCH) $(DEBUG_FLAGS) LIBS = -L$(PVMLDIR) -l$(PVMLIB) $(ARCHLIB) HEADERS = $(PVMIDIR)/pvm3.h $(PVMIDIR)/pvmproto.h $(SDIR)/srm.h Index: pvm-3.4.5/src/Makefile.aimk =================================================================== --- pvm-3.4.5.orig/src/Makefile.aimk +++ pvm-3.4.5/src/Makefile.aimk @@ -68,9 +68,8 @@ CFLOPTS = -O #OPTIONS = -p OPTIONS = -DCLUMP_ALLOC -DSTATISTICS \ -DTIMESTAMPLOG -DSANITY -CFLAGS = $(CFLOPTS) $(OPTIONS) -I$(PVMDIR)/include \ - -DARCHCLASS=\"$(PVM_ARCH)\" -DIMA_$(PVM_ARCH) \ - $(ARCHCFLAGS) +CFLAGS = $(ARCHCFLAGS) $(CFLOPTS) $(OPTIONS) -I$(PVMDIR)/include \ + -DARCHCLASS=\"$(PVM_ARCH)\" -DIMA_$(PVM_ARCH) LIBPREFIX = lib LIBPVM = $(LIBPREFIX)pvm3 @@ -96,27 +95,19 @@ DOBJ = \ ddpro.o \ host.o \ hoster.o \ - imalloc.o \ msgbox.o \ pkt.o \ - pmsg.o \ - pvmalloc.o \ - pvmcruft.o \ pvmd.o \ + pvmcruft.o \ pvmdpack.o \ pvmdtev.o \ - pvmerr.o \ - pvmfrag.o \ pvmlog.o \ sdpro.o \ task.o \ - tdpro.o \ - waitc.o \ global.o \ - $(REGEXOBJS) + tdpro.o SOCKDOBJ = \ - pvmdabuf.o \ pvmdunix.o SHMEMDOBJ = \ Index: pvm-3.4.5/tasker/Makefile.aimk =================================================================== --- pvm-3.4.5.orig/tasker/Makefile.aimk +++ pvm-3.4.5/tasker/Makefile.aimk @@ -19,8 +19,8 @@ BDIR = $(PVMDIR)/bin XDIR = $(BDIR)/$(PVM_ARCH) CFLOPTS = -g -CFLAGS = $(CFLOPTS) -I$(PVMIDIR) $(ARCHCFLAGS) \ - -DIMA_$(PVM_ARCH) $(ARCHCFLAGS) +CFLAGS = $(ARCHCFLAGS) $(CFLOPTS) -I$(PVMIDIR) $(ARCHCFLAGS) \ + -DIMA_$(PVM_ARCH) LIBS = -L$(PVMLDIR) -l$(PVMLIB) $(ARCHLIB) HEADERS = $(PVMIDIR)/pvm3.h $(PVMIDIR)/pvmproto.h Index: pvm-3.4.5/tracer/Makefile.aimk =================================================================== --- pvm-3.4.5.orig/tracer/Makefile.aimk +++ pvm-3.4.5/tracer/Makefile.aimk @@ -22,7 +22,7 @@ CFLOPTS = -O #CC = cc #CC = gcc -CFLAGS = $(CFLOPTS) $(PVMVERSION) -DIMA_$(PVM_ARCH) $(ARCHCFLAGS) +CFLAGS = $(ARCHCFLAGS) $(CFLOPTS) $(PVMVERSION) -DIMA_$(PVM_ARCH) # Index: pvm-3.4.5/xep/Makefile.aimk =================================================================== --- pvm-3.4.5.orig/xep/Makefile.aimk +++ pvm-3.4.5/xep/Makefile.aimk @@ -20,8 +20,8 @@ BDIR = $(PVMDIR)/bin XDIR = $(BDIR)/$(PVM_ARCH) #CFLOPTS = -O -CFLOPTS = -g -CFLAGS = $(CFLOPTS) -I$(PVMIDIR) -L$(PVMLDIR) $(ARCHCFLAGS) +#CFLOPTS = -g +CFLAGS = $(ARCHCFLAGS) $(CFLOPTS) -I$(PVMIDIR) -L$(PVMLDIR) LIBS = -l$(PVMLIB) $(ARCHLIB) $(OS2XEPLIBS) XLIBS = -lXaw -lXmu -lXext -lXt -lX11 XCFLAGS = -I/usr/local/X11R5/include -I/usr/local/X11/include \