*** empty log message ***

diff --git a/src/Makefile b/src/Makefile
index 4a176a0420f9dde176735ef08689b9f8585d87a9..5b94944335f83dcf57c88c378ae180c1f94f454a 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -248,7 +248,7 @@ TMPSCRIPTIN=setup.iss.in
 APPLICATION=IMaCh
 APPNAME=$(APPLICATION)-$(VERSION)
 APPCOMPILATIONMODE=$(IMACHSETUPVERSION)
-GNUPLOTVERSION=4.6
+GNUPLOTVERSION=5.1
 LICENSE=Copying
 TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe
 TMPNOREGSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-noreg-setup.exe
@@ -315,7 +315,7 @@ imachICL-build: imach.c
 #/GS /W3 /Gy /Zc:wchar_t /Zi /O2 /Fd"x64\Release\vc120.pdb" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_LIB" /D "_UNICODE" /D "UNICODE" /Qipo /Zc:forScope /Oi /MT /Fa"x64\Release\" /EHsc /nologo /Fo"x64\Release\" /Qprof-dir "x64\Release\" /Fp"x64\Release\IMaCh-icl-x64-0.98q2.pch"
 #  /Users/nbrouard/Documents/imach/imach-gui/build/icl64/Release/imach.exe
 # both 32 and 64 executables should have been built on Windows with Intel compiler.
-imachICL-setup: ../build/icl64/Release/IMaCh-$(VERSION).exe ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss ../distributions/windows/mybuildicl64.bat ../distributions/windows/mybuildicl32.bat 
+imachICL-setup: ../build/icl64/Release/IMaCh-$(VERSION).exe ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss ../distributions/windows/mybuildicl64.bat ../distributions/windows/mybuildicl32.bat setup.iss 
        pwd
        touch setup.iss.in
        $(SETUPCOMP) /cc setup.iss
@@ -461,7 +461,7 @@ ifdef _linux64onosx
        (cd .. && $(TAR) jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt)
 endif
 
-imachopt.o : imach.c
+imachopt.o : imach.c version.h
        $(CC) $(CFLAGSOPT) $(CROSSCOMPILATION) -o imachopt.o -c imach.c
 #      $(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c
 
@@ -472,6 +472,8 @@ imachUB : imach32 imach64
 #imachdmg : imachopt.o create-dmg applet IMaChInfo.plist.in IMaChPkgInfo.in IMaCh.icns main.scpt.in IMaCh-ecrandemarrage.rsrc TXT.rtf
 #      $(CC) $(LFLAGSOPT) -o imach imachopt.o
        #hdiutil detach /Volumes/IMaCh\ $(VERSION)
+#      cp ../../distributions/osx/gnuplot_bin/gnuplot_2_6_5_OSX imach$(VERSION).app/Contents/Resources/bin/gnuplot;\
+
 imachdmg : imachopt.o ../distributions/osx/create-dmg ../distributions/osx/createdmg3.sh ../distributions/osx/applet ../distributions/osx/IMaChInfo.plist.in ../distributions/osx/IMaChPkgInfo.in ../distributions/osx/IMaCh.icns ../distributions/osx/main.scpt.in ../distributions/osx/IMaCh-ecrandemarrage.rsrc ../distributions/osx/TXT.rtf
        pwd
        (cd ../build && rm -r osx && mkdir osx && cd osx ;\
@@ -489,7 +491,7 @@ imachdmg : imachopt.o ../distributions/osx/create-dmg ../distributions/osx/creat
        mkdir -p imach$(VERSION).app/Contents/Resources/bin;\
        mkdir -p imach$(VERSION).app/Contents/Resources/html;\
        cp IMaCh-$(VERSION) imach$(VERSION).app/Contents/Resources/bin/imach;\
-       cp ../../distributions/osx/gnuplot_bin/gnuplot_2_6_5_OSX imach$(VERSION).app/Contents/Resources/bin/gnuplot;\
+       cp ../../distributions/osx/gnuplot_bin/gnuplot_5_1_OSX imach$(VERSION).app/Contents/Resources/bin/gnuplot;\
        mkdir -p imach$(VERSION).app/Contents/Resources/description.rtfd;\
        cp -p ../../distributions/osx/TXT.rtf imach$(VERSION).app/Contents/Resources/description.rtfd ;\
        $(SED) -e "s/@VERSION@/$(VERSION)/g;" ../../distributions/osx/IMaChInfo.plist.in  >imach$(VERSION).app/Contents/Info.plist ;\
@@ -513,8 +515,8 @@ imachdmg : imachopt.o ../distributions/osx/create-dmg ../distributions/osx/creat
 md5:
        ls Output/* | xargs md5sum
 upload:
-       rsync -v Output/IMaCh-0.98r0-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
-       rsync -v Output/imach0.98r0.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+       rsync -v Output/IMaCh-0.98r2-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+       rsync -v Output/imach0.98r2.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 #      rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 
 imachcyg : imachcyg.o