diff -Naur scilab-4.1.2/configure.in scilab-4.1.2.new/configure.in --- scilab-4.1.2/configure.in 2007-09-10 04:46:20.000000000 -0400 +++ scilab-4.1.2.new/configure.in 2009-08-03 08:57:29.000000000 -0400 @@ -2354,7 +2354,7 @@ AC_SUBST(JAVASCITARGET_DISTCLEAN) AC_SUBST(JAVA_INCL) AC_SUBST(GCCFIX) -AC_OUTPUT(Makefile.OBJ Makefile.incl Makefile scripts/Makefile routines/Makefile routines/default/Makefile routines/os_specific/Makefile routines/graphics/Makefile routines/menusX/Makefile routines/xsci/Makefile routines/sparse/Makefile Makemex config/Makeso.incl routines/interf/Makefile routines/control/Makefile routines/system/Makefile routines/calelm/Makefile config/Makefile.aix config/Makefile.ultrix routines/lapack/Makefile scripts/scilab.g scripts/scilab-gtk.g examples/Makefile routines/version.h imp/Makefile routines/gtksci/Makefile pvm3/Makefile pvm3/Makefile.aimk pvm3/hoster/Makefile.aimk config/configuration macros/util/gettklib.sci macros/util/xmlfiletohtml.sci routines/gzvt2/Makefile routines/Javasci/Makefile $MAN_FR $MAN_ENG) +AC_OUTPUT(Makefile.OBJ Makefile.incl Makefile scripts/Makefile routines/Makefile routines/default/Makefile routines/os_specific/Makefile routines/graphics/Makefile routines/menusX/Makefile routines/xsci/Makefile routines/sparse/Makefile Makemex config/Makeso.incl routines/interf/Makefile routines/control/Makefile routines/system/Makefile routines/calelm/Makefile config/Makefile.aix config/Makefile.ultrix routines/lapack/Makefile scripts/scilab.g scripts/scilab-gtk.g examples/Makefile routines/version.h imp/Makefile routines/gtksci/Makefile pvm3/Makefile pvm3/Makefile.aimk config/configuration macros/util/gettklib.sci macros/util/xmlfiletohtml.sci routines/gzvt2/Makefile routines/Javasci/Makefile $MAN_FR $MAN_ENG) diff -Naur scilab-4.1.2/pvm3/Make-PVM3.mak scilab-4.1.2.new/pvm3/Make-PVM3.mak --- scilab-4.1.2/pvm3/Make-PVM3.mak 2004-02-10 11:02:42.000000000 -0500 +++ scilab-4.1.2.new/pvm3/Make-PVM3.mak 2009-08-03 08:54:21.000000000 -0400 @@ -6,7 +6,7 @@ PVM_CCOMPILER=VISUALC++ -all :: message libs pvmtracer pvmconsole gslib pvmhoster +all :: message libs pvmtracer pvmconsole gslib message :: @echo ==================================== @@ -44,15 +44,15 @@ @nmake /C /f makefile.mak @cd $(PVM_ROOT) -pvmhoster: - @echo making all in hoster - @cd $(PVM_ROOT)\hoster - @SET PVM_ROOT=$(PVM_ROOT) - @SET PVM_ARCH=$(PVM_ARCH) - @SET PVM_CCOMPILER=$(PVM_CCOMPILER) - @SET PVM_CINCLUDE=. - @nmake /C /f makefile.mak - @cd $(PVM_ROOT) +#pvmhoster: +# @echo making all in hoster +# @cd $(PVM_ROOT)\hoster +# @SET PVM_ROOT=$(PVM_ROOT) +# @SET PVM_ARCH=$(PVM_ARCH) +# @SET PVM_CCOMPILER=$(PVM_CCOMPILER) +# @SET PVM_CINCLUDE=. +# @nmake /C /f makefile.mak +# @cd $(PVM_ROOT) gslib : @echo making all in pvmgs diff -Naur scilab-4.1.2/pvm3/Makefile.aimk.in scilab-4.1.2.new/pvm3/Makefile.aimk.in --- scilab-4.1.2/pvm3/Makefile.aimk.in 2002-10-31 08:14:04.000000000 -0500 +++ scilab-4.1.2.new/pvm3/Makefile.aimk.in 2009-08-03 08:52:20.000000000 -0400 @@ -139,8 +139,8 @@ @ echo "done building srm" ## build hoster ## -h: - @ echo "building hoster" - - cd hoster; ../lib/aimk $(PVMOPTS) install - @ echo "done building hoster" +#h: +# @ echo "building hoster" +# - cd hoster; ../lib/aimk $(PVMOPTS) install +# @ echo "done building hoster" diff -Naur scilab-4.1.2/pvm3/Makefile.mak scilab-4.1.2.new/pvm3/Makefile.mak --- scilab-4.1.2/pvm3/Makefile.mak 2002-10-28 09:09:22.000000000 -0500 +++ scilab-4.1.2.new/pvm3/Makefile.mak 2009-08-03 08:52:47.000000000 -0400 @@ -3,7 +3,7 @@ include ../Makefile.incl.mak -all :: message libs pvmtracer pvmconsole gslib pvmhoster +all :: message libs pvmtracer pvmconsole gslib message :: @echo ==================================== @@ -41,15 +41,15 @@ @nmake /C /f makefile.mak @cd $(PVM_ROOT) -pvmhoster: - @echo making all in hoster - @cd $(PVM_ROOT)\hoster - @SET PVM_ROOT=$(PVM_ROOT) - @SET PVM_ARCH=$(PVM_ARCH) - @SET PVM_CCOMPILER=$(PVM_CCOMPILER) - @SET PVM_CINCLUDE=. - @nmake /C /f makefile.mak - @cd $(PVM_ROOT) +#pvmhoster: +# @echo making all in hoster +# @cd $(PVM_ROOT)\hoster +# @SET PVM_ROOT=$(PVM_ROOT) +# @SET PVM_ARCH=$(PVM_ARCH) +# @SET PVM_CCOMPILER=$(PVM_CCOMPILER) +# @SET PVM_CINCLUDE=. +# @nmake /C /f makefile.mak +# @cd $(PVM_ROOT) gslib : @echo making all in pvmgs diff -Naur scilab-4.1.2/pvm3/hoster/Makefile.aimk.in scilab-4.1.2.new/pvm3/hoster/Makefile.aimk.in --- scilab-4.1.2/pvm3/hoster/Makefile.aimk.in 2002-10-31 08:14:04.000000000 -0500 +++ scilab-4.1.2.new/pvm3/hoster/Makefile.aimk.in 1969-12-31 19:00:00.000000000 -0500 @@ -1,54 +0,0 @@ -# -# $Id: Makefile.aimk.in,v 1.2 2002/10/31 13:14:04 chanceli Exp $ -# -# Generic Makefile body to be concatenated to config header. -# -# Imports: -# PVM_ARCH = the official pvm-name of your processor -# ARCHCFLAGS = special cc flags -# ARCHLIB = special libs needed for daemon -# -SHELL = /bin/sh -PVMDIR = ../.. -PVMIDIR = $(PVMDIR)/include -PVMSDIR = $(PVMDIR)/src -PVMLDIR = $(PVMDIR)/lib/$(PVM_ARCH) -PVMLIB = pvm3 -LIBPREFIX = lib -PVMLIBDEP = $(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).a -SDIR = $(PVMDIR)/hoster -BDIR = $(PVMDIR)/bin -XDIR = $(BDIR)/$(PVM_ARCH) - -CFLOPTS = -O -CFLAGS = $(CFLOPTS) -I$(PVMIDIR) -I$(PVMSDIR) -DIMA_$(PVM_ARCH) \ - $(ARCHCFLAGS) -LIBS = -L$(PVMLDIR) -l$(PVMLIB) $(ARCHLIB) - -HEADERS = $(PVMIDIR)/pvm3.h $(PVMIDIR)/pvmproto.h - -REXECOBJ = @PVMHOSTERFILES@ - -default: all -install: all - -all: $(XDIR)/hoster$(EXESFX) - -$(XDIR): - - mkdir $(BDIR) - - mkdir $(XDIR) - -$(XDIR)/hoster$(EXESFX): $(XDIR) hoster$(EXESFX) - cp hoster$(EXESFX) $(XDIR) - -hoster$(EXESFX): $(SDIR)/hoster.c $(HEADERS) $(PVMLIBDEP) $(REXECOBJ) - $(CC) $(CFLAGS) -o $@ $(SDIR)/hoster.c $(REXECOBJ) $(LIBS) - -rexec.o: $(PVMDIR)/src/$(PVM_ARCH)/src/rexec.c - $(CC) $(CFLAGS) -c $(PVMDIR)/src/$(PVM_ARCH)/src/rexec.c -ruserpas.o: $(PVMDIR)/src/$(PVM_ARCH)/src/ruserpas.c - $(CC) $(CFLAGS) -c $(PVMDIR)/src/$(PVM_ARCH)/src/ruserpas.c - -clean: - rm -f *.o hoster$(EXESFX) - diff -Naur scilab-4.1.2/pvm3/hoster/Makefile.mak scilab-4.1.2.new/pvm3/hoster/Makefile.mak --- scilab-4.1.2/pvm3/hoster/Makefile.mak 2002-10-28 08:56:35.000000000 -0500 +++ scilab-4.1.2.new/pvm3/hoster/Makefile.mak 1969-12-31 19:00:00.000000000 -0500 @@ -1,64 +0,0 @@ -# -# $Id: Makefile.mak,v 1.1 2002/10/28 13:56:34 chanceli Exp $ -# - -#*************************************************************# -#** **# -#** Nmake file for the PVM hoster **# -#** hoster.exe **# -#** **# -#** **# -#*************************************************************# - - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!include $(PVM_ROOT)\conf\$(PVM_ARCH).def - -SDIR = $(PVM_ROOT)\src -HDIR = $(PVM_ROOT)\hoster - -OBJS = $(PVM_ARCH)\hoster.obj $(PVM_ARCH)\pvmwinrexec.obj \ - $(PVM_ARCH)\pvmwinrsh.obj - -all: paths hoster - -# - -paths: - @if not exist "$(PVM_ROOT)\bin\$(PVM_ARCH)\$(NULL)" mkdir "$(PVM_ROOT)\bin\$(PVM_ARCH)" - @if not exist "$(PVM_ARCH)\$(NULL)" mkdir "$(PVM_ARCH)" - -hoster: $(PVM_ROOT)\bin\$(PVM_ARCH)\hoster.exe - -$(PVM_ROOT)\bin\$(PVM_ARCH)\hoster.exe : $(OBJS) - @echo Creation of $*.exe - @$(linkexe) $(conflags) \ - $(OUTBIN)$(PVM_ROOT)\bin\$(PVM_ARCH)\hoster.exe \ - $(OBJS) $(PVM_ROOT)\lib\$(PVM_ARCH)\libpvm3.lib \ - $(link_multithread) /nodefaultlib:libc.lib - -$(PVM_ARCH)\hoster.obj: $(HDIR)\hoster.c - $(cc) $(cdebug) $(cflags) $(cvars) \ - $(OUT)$(PVM_ARCH)\hoster.obj $(HDIR)\hoster.c - -$(PVM_ARCH)\pvmwinrexec.obj: $(HDIR)\pvmwinrexec.c - $(cc) $(cdebug) $(cflags) $(cvars) \ - $(OUT)$(PVM_ARCH)\pvmwinrexec.obj \ - $(HDIR)\pvmwinrexec.c - -$(PVM_ARCH)\pvmwinrsh.obj: $(HDIR)\pvmwinrsh.c - $(cc) $(cdebug) $(cflags) $(cvars) \ - $(OUT)$(PVM_ARCH)\pvmwinrsh.obj \ - $(HDIR)\pvmwinrsh.c - -# Clean up everything but the .EXEs - -clean : - -del *.obj - -del *.pdb -