Summary: 0.98q1

diff --git a/src/Makefile b/src/Makefile
index 460b54a2aee9b1622e87031a6bb30bca9e4551f9..65d0f10caebaa405edd4c72c490f71c4709327d8 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,6 @@
-VERSION=0.98q0
+VERSION=0.98q1
 COPYRIGHT=Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2015
-IMACHSETUPVERSION=ilc
+IMACHSETUPVERSION=ilc # This is for Windows only
 #IMACHSETUPVERSION=mvc
 
 #       Linux
@@ -44,7 +44,8 @@ IMACHSETUPVERSION=ilc
 #TESTFILE=$$HOME/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc-test-mac/adecode-1.142c.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/carol/carol-june2014/educadlmwt24.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/biaspar-wopowell.imach
-TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/rbiaspar-098p.imach
+#TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/rbiaspar-098p.imach
+TESTFILE=$(HOME)/Documents/Recherches/REVES/Aaron/brouard/results/COVARAITE_94/rmypar24pis1cov1-age.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc-test-mac/adecode-1.142c.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc_test_magei4/radlc_often.imach
 #CC= gcc -v
@@ -54,9 +55,11 @@ GCC= gcc
 ifdef _macosx
 # Mac OS/X version
 LFLAGS= -g -lm 
-CFLAGS= -g -DDEBUG 
+#CFLAGS= -g -DDEBUG 
+CFLAGS= -g 
 LFLAGSOPT= -O3 -lm 
 CFLAGSOPT= -O3 
+CP= cp
 CROSSCOMPILATION= -DCROSS=0
 UNIX2DOS= echo "Unix2dos " 
 DSYMUTIL= dsymutil
@@ -208,7 +211,8 @@ endif
 ifdef _linux
 #CFLAGS= -g -DUNIX -DDEBUGHESS
 #CFLAGS= -g -DDEBUG -DFIXMNBRAK
-CFLAGS= -g -DDEBUG 
+#CFLAGS= -g -DDEBUG 
+CFLAGS= -g
 LFLAGS= -g -lm
 IGSL= -I/usr/include/gsl
 LGSL= -lgsl -lgslcblas
@@ -310,7 +314,6 @@ imachILC64-setup: IMaCh-ilc64-$(VERSION).exe setup.iss
 
 imachILC64-noreg-setup: IMaCh-ilc64-$(VERSION).exe noreg-setup.iss
        touch setup.iss.in
-       $(CP) IMaCh-ilc64-$(VERSION).exe imach.exe
        $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
        $(CP) Output/$(TMPSETUPEXE) imachILC64-noreg-setup
 
@@ -330,7 +333,7 @@ imachMVC-setup: imachMVC.exe setup.iss
        touch setup.iss.in
        $(CP) imachMVC.exe imach.exe
        $(SETUPCOMP) /cc setup.iss
-       $(CP) Output/$(TMPSETUPEXE) imachcyg-setup
+       $(CP) Output/$(TMPSETUPEXE) imachMVC-setup
 
 # imachcyg-noreg-setup : imachcygopt imachcygopt.o setup.iss.in noreg-setup.iss $(TMPNOREGSETUPEXE)
 imachMVC-noreg-setup: imachMVC.exe noreg-setup.iss
@@ -357,7 +360,8 @@ ifdef _macosx
 endif
 
 imach.o : imach.c 
-        $(CC) $(CFLAGS) $(CROSSCOMPILATION) -DDEBUGBRENT -c imach.c
+        $(CC) $(CFLAGS) $(CROSSCOMPILATION)  -c imach.c
+#       $(CC) $(CFLAGS) $(CROSSCOMPILATION) -DDEBUGBRENT -c imach.c
 
 imachtest.o : imach.c 
         $(CC) $(CFLAGS) $(CROSSCOMPILATION) -DPOWELLORIGINAL -DNRCORIGINAL -DINFINITYORIGINAL -DDEBUGBRENT -o imachtest.o -c imach.c
@@ -397,7 +401,7 @@ imachBOBYQAopt.o : imach.c
 
 imachopt : imachopt.o 
        $(CC) $(LFLAGSOPT) -o imachopt imachopt.o
-       ln -f imachopt imach
+#      ln -f imachopt imach
        $(CP) imachopt Output/imachopt$(VERSION)-$(BINVERSION)
        $(CP) -f imach ../bin
 ifdef _intel64onosx
@@ -453,8 +457,9 @@ imachdmg : imachopt.o create-dmg applet IMaChInfo.plist.in IMaChPkgInfo.in IMaCh
 #      ./create-dmg --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION).app
 #      ./createdmg2.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION)
 
-upload:
+md5:
        ls Output/* | xargs md5sum
+upload:
        rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/
 
 imachcyg : imachcyg.o