[BACK]Return to Makefile CVS log [TXT] [DIR] Up to [Local Repository] / imach / src

Diff for /imach/src/Makefile between versions 1.74 and 1.84

version 1.74, 2015/11/21 15:11:52 version 1.84, 2019/05/09 15:19:47
Line 1 Line 1
 #Version has to be set in ../CMakeLists.txt too.  #Version has to be set in ../CMakeLists.txt too.
 #VERSION=0.98r2  #VERSION=0.98r6
 #VERSION=$(shell echo `grep IMACH_VERSION__ version.h | echo 'titi'`)  #VERSION=$(shell echo `grep IMACH_VERSION__ version.h | echo 'titi'`)
 VERSION=$(shell echo `grep IMACH_VERSION__ version.h | awk 'BEGIN { FS = "[ \t\n\"]+" }  { print $$3 }'`)  VERSION=$(shell echo `grep IMACH_VERSION__ version.h | awk 'BEGIN { FS = "[ \t\n\"]+" }  { print $$3 }'`)
 OSTYPE = $(shell echo $$OSTYPE)  OSTYPE = $(shell echo $$OSTYPE)
Line 7  OSTYPE = $(shell echo $$OSTYPE) Line 7  OSTYPE = $(shell echo $$OSTYPE)
 DRIVEG=f:  DRIVEG=f:
 #DIRG is the corresponding build directory for Virtual Windows  #DIRG is the corresponding build directory for Virtual Windows
 DIRG=\imach\cvs\imach\build  DIRG=\imach\cvs\imach\build
 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  COPYRIGHT=Copyright (C)  2002-2016 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2016-18
 IMACHSETUPVERSION=icl  IMACHSETUPVERSION=icl
 # This is for Windows only  # This is for Windows only
 #IMACHSETUPVERSION=mvc  #IMACHSETUPVERSION=mvc
Line 15  IMACHSETUPVERSION=icl Line 15  IMACHSETUPVERSION=icl
 #       Linux  #       Linux
 # make _linux=1 imachopt  # make _linux=1 imachopt
 # make _linux=1 imach  # make _linux=1 imach
 # cpack -D CPACK_RPM_PACKAGE_DEBUG=1 -D CPACK_RPM_SPEC_INSTALL_POST="/bin/true" -G RPM  # make _linux=1 imachrpm
   # cd to build/gnulinux ; cmake ../..; cpack -D CPACK_RPM_PACKAGE_DEBUG=1 -D CPACK_RPM_SPEC_INSTALL_POST="/bin/true" -G RPM
 # make _linux32onosx=1 imachopt  # make _linux32onosx=1 imachopt
 # make _linux64onosx=1 imachopt  # make _linux64onosx=1 imachopt
   
Line 55  IMACHSETUPVERSION=icl Line 56  IMACHSETUPVERSION=icl
 #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/Aaron/brouard/results/COVARAITE_94/rmypar24pis1cov1-age.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/Flavia/rADL0w_V1V2b.imach  #TESTFILE=$(HOME)/Documents/Recherches/REVES/Flavia/rADL0w_V1V2b.imach
 TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/rrtest3b.imach  #TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/rrtest3b.imach
   #TESTFILE=$(HOME)//Documents/Recherches/REVES/Flavia/Flavia-nov-2015/rtest3c.imach
   #TESTFILE=/mnt/tugault/Documents/Recherches/REVES/Yao/rhrs-yao-test-back.imach
   #TESTFILE=/mnt/tugault/Documents/Recherches/REVES/Flavia/Flavia-nov-2015/rtest3bb.imach
   #TESTFILE=$(HOME)/Documents/Recherches/REVES/Flavia/Flavia-nov-2015/rtest3bb.imach
   #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/saito-12-feb-2016/rHRS_relig_import_M_NB.imach
   #TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/biaspar-0.98r-powellf1f3linmnb-zeroes.imach
   #TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/Yao-19-jan-2016/r2V4V3V5.imach
   #TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/Yao-19-jan-2016/r2b4V4V3V5.imach
   #TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/Yao-19-jan-2016/Vn1b.imach
   #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Saito-PAA-2018/rrLvngArrgJapan-two-1b.imach
   TESTFILE=$(HOME)/Documents/Recherches/HRS/RAND_HRS/imachb.imach
   #TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/Yao-19-jan-2016/rrrV4V3V5-suite6.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc-test-mac/adecode-1.142c.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  #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc_test_magei4/radlc_often.imach
 #CC= gcc -v  #CC= gcc -v
Line 315  imachICL-build: imach.c Line 328  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"  #/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  #  /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.  # 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 setup.iss   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          pwd
         touch setup.iss.in          touch setup.iss.in
Line 336  imachICL64-noreg-setup: IMaCh-icl64-$(VE Line 350  imachICL64-noreg-setup: IMaCh-icl64-$(VE
         rm -rf ../build/icl64  && mkdir ../build/icl64          rm -rf ../build/icl64  && mkdir ../build/icl64
         cp ../distributions/windows/mybuildicl64.bat ../build/icl64/          cp ../distributions/windows/mybuildicl64.bat ../build/icl64/
         cd ../build/icl64          cd ../build/icl64
         VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \          VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\System32\cmd.exe" \
         --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/c" "$(DRIVEG)$(DIRG)\icl64\mybuildicl64.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"   --username brouard  --verbose --wait-stdout  --wait-stderr -- "C:\Windows\SysWOW64\cmd.exe" "/c" "$(DRIVEG)$(DIRG)\icl64\mybuildicl64.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
   
   #       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "c:\\windows\\system32\\ipconfig.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/all"
   #       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/c" "DIR"
   
   #       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/c" "DIR" 
   #       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "c:\\windows\\system32\\ipconfig.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/all"
   #VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \
   #       --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/c" "$(DRIVEG)$(DIRG)\icl64\mybuildicl64.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
   
 ../build/icl32/Release/IMaCh-$(VERSION).exe: imach.c ../distributions/windows/mybuildicl32.bat  ../build/icl32/Release/IMaCh-$(VERSION).exe: imach.c ../distributions/windows/mybuildicl32.bat
         rm -rf ../build/icl32 && mkdir -p ../build/icl32          rm -rf ../build/icl32 && mkdir -p ../build/icl32
         cp ../distributions/windows/mybuildicl32.bat ../build/icl32/          cp ../distributions/windows/mybuildicl32.bat ../build/icl32/
         cd ../build/icl32          cd ../build/icl32
         VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \          VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\System32\cmd.exe" \
         --username brouard  --verbose  --wait-stdout -- "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"    --username brouard  --verbose --wait-stdout -- "C:\Windows\SysWOW64\cmd.exe" "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
   
   #VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \
   # --username brouard  --verbose  --wait-stdout -- "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
   
 ../build/vs32/Release/IMaCh-$(VERSION).exe: imach.c mybuildvs32.bat  ../build/vs32/Release/IMaCh-$(VERSION).exe: imach.c mybuildvs32.bat
         rm -rf ../build/vs32 && mkdir -p ../build/vs32          rm -rf ../build/vs32 && mkdir -p ../build/vs32
         cp mybuildvs32.bat ../build/vs32/          cp mybuildvs32.bat ../build/vs32/
         cd ../build/vs32          cd ../build/vs32
         VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \          VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\System32\cmd.exe" \
         --username brouard  --verbose  --wait-stdout -- "/c" "g:\imach\imach-gui\build\vs32\mybuildvs32.bat" "$(VERSION)"          --username brouard  --verbose  --wait-stdout --  "C:\Windows\SysWOW64\cmd.exe" "/c" "g:\imach\imach-gui\build\vs32\mybuildvs32.bat" "$(VERSION)"
 # C:\Windows\SysWOW64\cmd.exe /E:ON /V:ON /K "g:\imach\imach-gui\build\icl32\mybuild.bat"  # C:\Windows\SysWOW64\cmd.exe /E:ON /V:ON /K "g:\imach\imach-gui\build\icl32\mybuild.bat"
 #WORK   --username brouard  --verbose --wait-exit --wait-stdout -- "/c" "c:\users\brouard\mybuild.bat"  #WORK   --username brouard  --verbose --wait-exit --wait-stdout -- "/c" "c:\users\brouard\mybuild.bat"
 #       --username brouard  --verbose --wait-exit --wait-stdout -- "/c" "g: && cd \imach\imach-gui\build\icl32 && mybuild.bat"  #       --username brouard  --verbose --wait-exit --wait-stdout -- "/c" "g: && cd \imach\imach-gui\build\icl32 && mybuild.bat"
Line 404  ifdef _macosx Line 429  ifdef _macosx
 endif  endif
   
 imach.o : imach.c   imach.o : imach.c 
          $(CC) $(CFLAGS) $(CROSSCOMPILATION)  -c imach.c           $(CC) $(CFLAGS) $(CROSSCOMPILATION)  -c $<
   #        $(CC) $(CFLAGS) $(CROSSCOMPILATION)  -DDEBUGMEM -c $<
 #        $(CC) $(CFLAGS) $(CROSSCOMPILATION) -DDEBUGBRENT -c imach.c  #        $(CC) $(CFLAGS) $(CROSSCOMPILATION) -DDEBUGBRENT -c imach.c
   
   imach-0.98r: imach-0.98r.o 
           $(CC) $(LFLAGS) -o $@ $<
   ifdef _macosx
           $(DSYMUTIL) $@
   endif
   
   # Horrible no f3<f1 test and direct test,  converges if close to maximum otherwise diverges
   #calls = 13 & 1760, -2 Log likelihood = 46537.411806825585
   imach-0.98r.o : imach-0.98r.c 
            $(CC) $(CFLAGS) -DPOWELLNOF3INFF1TEST -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION)  -c $<
   
   #################
   imach-0.98r-powellsf1f3: imach-0.98r-powellsf1f3.o 
           $(CC) $(LFLAGS) -o $@ $<
   ifdef _macosx
           $(DSYMUTIL) $@
   endif
   
   # test f3<f1 but direct test and no powell criteria which are NOPOWELLORIGINALNOMNBAKORIGINAL NOLINMINORIGINAL
   # diverges now from zeroes calls = 18 & 3163, -2 Log likelihood = 50929.075310962719
   # but converges if close to the maximum
   # calls = 13 & 1760, -2 Log likelihood = 46537.411806825585
   imach-0.98r-powellsf1f3.o : imach-0.98r.c 
            $(CC) $(CFLAGS)  -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE  $(CROSSCOMPILATION) -o $@  -c $<
   #        $(CC) $(CFLAGS)  -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE  $(CROSSCOMPILATION) -E -c $< | cppbeauty
   
   ######
   imach-0.98r-powellf1f3: imach-0.98r-powellf1f3.o 
           $(CC) $(LFLAGS) -o $@ $<
   ifdef _macosx
           $(DSYMUTIL) $@
   endif
   
   #Powell original but with mnbrak fix  -DUNKNOWNSTATUSNOTCONTRIBUTING -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE
   #diverges from zeroes
   # calls = 13 & 1760, -2 Log likelihood = 46537.411806825585 Real minumum
   imach-0.98r-powellf1f3.o : imach-0.98r.c 
            $(CC) $(CFLAGS) -DPOWELLORIGINAL -DLINMINORIGINAL -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION) -o $@  -c $<
   imach-0.98r-powellf1f3.i : imach-0.98r.c 
            $(CC) $(CFLAGS) -DPOWELLORIGINAL -DLINMINORIGINAL -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION) -E   -c $<| cppbeauty
   #        $(CC) $(CFLAGS) -DPOWELLORIGINAL -DLINMINORIGINAL  $(CROSSCOMPILATION) -E -o $@  -c $<
   
   ######################
   imach-0.98r-powell: imach-0.98r-powell.o 
           $(CC) $(LFLAGS) -o $@ $<
   ifdef _macosx
           $(DSYMUTIL) $@
   endif
   
   # Powell original means without -DPOWELLNOF3INFF1TEST (with F3<F1 test) 
   #calls = 33 & 4088, -2 Log likelihood = 46623.239341985027 reaches the maximum !
   #From zeroes doesn't reach the maximum calls = 34 & 4212, -2 Log likelihood = 46542.398769900567
   #calls = 34 & 4212, -2 Log likelihood = 46542.398769900567
   imach-0.98r-powell.o : imach-0.98r.c 
            $(CC) $(CFLAGS) -DPOWELLORIGINAL -DLINMINORIGINAL -DMNBRAKORIGINAL  -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION) -o $@  -c $<
   #        $(CC) $(CFLAGS) -DPOWELLORIGINAL -DLINMINORIGINAL -DMNBRAKORIGINAL $(CROSSCOMPILATION) -E  -c $< | cppbeauty
   
   imach-0.98r-powell.i : imach-0.98r.c 
            $(CC) $(CFLAGS) -DPOWELLORIGINAL -DLINMINORIGINAL -DMNBRAKORIGINAL $(CROSSCOMPILATION) -E -o $@ -c $< 
   
   ###############
   # powell test with f1f3 powell, linmin fix but no mnbrak fix
   imach-0.98r-powellf1f3lin: imach-0.98r-powellf1f3lin.o 
           $(CC) $(LFLAGS) -o $@ $<
   ifdef _macosx
           $(DSYMUTIL) $@
   endif
   
   # ?calls = 41 & 4718, -2 Log likelihood = 46690.242656475864
   #calls = 33 & 4088, -2 Log likelihood = 46623.239341985027
   # from zeroes calls = 34 & 4212, -2 Log likelihood = 46542.398769900567
   imach-0.98r-powellf1f3lin.o : imach-0.98r.c 
            $(CC) $(CFLAGS) -DPOWELLORIGINAL -DMNBRAKORIGINAL  -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION) -o $@  -c $<
   
   #############
   
   
   # directest with f3<f1 without mnbrak fix but linmin fix
   imach-0.98r-powellf1f3orilin: imach-0.98r-powellf1f3orilin.o 
           $(CC) $(LFLAGS) -o $@ $<
   ifdef _macosx
           $(DSYMUTIL) $@
   endif
   
   #Maximum not reached but converge from zeroes
   #calls = 34 & 4212, -2 Log likelihood = 46542.398769900567
   imach-0.98r-powellf1f3orilin.o : imach-0.98r.c 
            $(CC) $(CFLAGS)  -DMNBRAKORIGINAL -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION) -o $@  -c $<
   
   #######
   
   # Powell test not direct, with mnbrak and linmin fixes
   imach-0.98r-powellf1f3linmnb: imach-0.98r-powellf1f3linmnb.o 
           $(CC) $(LFLAGS) -o $@ $<
   ifdef _macosx
           $(DSYMUTIL) $@
   endif
   
   # worst, diverges from zeroes -DDEBUGMNBRAK
   #calls = 18 & 3163, -2 Log likelihood = 50929.075310962719
   
   imach-0.98r-powellf1f3linmnb.o : imach-0.98r.c 
            $(CC) $(CFLAGS) -DDEBUG -DPOWELLORIGINAL -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION) -o $@  -c $<
   imach-0.98r-powellf1f3linmnb.i : imach-0.98r.c 
            $(CC) $(CFLAGS) -DDEBUG -DPOWELLORIGINAL -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION) -E -c $< | cppbeauty
   #########
   
   # Powell test not direct, with mnbrak and linmin fixes
   imach-0.98r-powellf1f3linmnbiter: imach-0.98r-powellf1f3linmnbiter.o 
           $(CC) $(LFLAGS) -o $@ $<
   ifdef _macosx
           $(DSYMUTIL) $@
   endif
   
   #
   #
   
   imach-0.98r-powellf1f3linmnbiter.o : imach-0.98r.c 
            $(CC) $(CFLAGS) -DDEBUG -DPOWELLORIGINAL -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE -DNODIRECTIONCHANGEDUNTILNITER $(CROSSCOMPILATION) -o $@  -c $<
   imach-0.98r-powellf1f3linmnbiter.i : imach-0.98r.c 
            $(CC) $(CFLAGS) -DDEBUG -DPOWELLORIGINAL -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE -DNODIRECTIONCHANGEDUNTILNITER $(CROSSCOMPILATION) -E -c $< | cppbeauty
   #########
   
   
   imach-0.98r-powellf1f3ori: imach-0.98r-powellf1f3ori.o 
           $(CC) $(LFLAGS) -o $@ $<
   ifdef _macosx
           $(DSYMUTIL) $@
   endif
   
   # Powell  with -DPOWELLNOF3INFF1TEST which is not Powell original!
   #calls = 41 & 4718, -2 Log likelihood = 46690.242656475864, doesn't reach the maximum
   imach-0.98r-powellf1f3ori.o : imach-0.98r.c 
            $(CC) $(CFLAGS) -DPOWELLNOF3INFF1TEST -DPOWELLORIGINAL -DLINMINORIGINAL -DMNBRAKORIGINAL $(CROSSCOMPILATION) -o $@  -c $< 
   imach-0.98r-powellf1f3ori.i : imach-0.98r.c 
            $(CC) $(CFLAGS) -DPOWELLNOF3INFF1TEST -DPOWELLORIGINAL -DLINMINORIGINAL -DMNBRAKORIGINAL $(CROSSCOMPILATION) -E -o $@  -c $<| cppbeauty
   
   
   
   
   
   
 imachtest.o : imach.c   imachtest.o : imach.c 
          $(CC) $(CFLAGS) $(CROSSCOMPILATION) -DPOWELLORIGINAL -DNRCORIGINAL -DINFINITYORIGINAL -DDEBUGBRENT -o imachtest.o -c imach.c           $(CC) $(CFLAGS) $(CROSSCOMPILATION) -DPOWELLORIGINAL -DNRCORIGINAL -DINFINITYORIGINAL -DDEBUGBRENT -o $@ -c $<
   
 #        $(CC) $(CFLAGS) $(CROSSCOMPILATION)  -DFIXMNBRAK -o imachtest.o -c imach.c  #        $(CC) $(CFLAGS) $(CROSSCOMPILATION)  -DFIXMNBRAK -o imachtest.o -c imach.c
   
Line 442  imachBOBYQAopt : imachBOBYQAopt.o Line 610  imachBOBYQAopt : imachBOBYQAopt.o
 imachBOBYQAopt.o : imach.c   imachBOBYQAopt.o : imach.c 
         $(CC) $(CFLAGS) -DNLOPT $(INLOPT) -DBOBYQA -o imachBOBYQAopt.o -c imach.c          $(CC) $(CFLAGS) -DNLOPT $(INLOPT) -DBOBYQA -o imachBOBYQAopt.o -c imach.c
   
   # imachback : imachback.o
   #       $(CC) $(LFLAGSOPT) -o imachback imachback.o
   
 imachopt : imachopt.o   imachopt : imachopt.o 
         $(CC) $(LFLAGSOPT) -o imachopt imachopt.o          $(CC) $(LFLAGSOPT) -o imachopt imachopt.o
Line 453  ifdef _intel64onosx Line 623  ifdef _intel64onosx
 endif  endif
 ifdef _macosx  ifdef _macosx
         $(STRIP) imach          $(STRIP) imach
           $(STRIP) imachopt
 endif  endif
 ifdef _linux32onosx  ifdef _linux32onosx
         (cd .. && $(TAR) jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt)          (cd .. && $(TAR) jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt)
Line 461  ifdef _linux64onosx Line 632  ifdef _linux64onosx
         (cd .. && $(TAR) jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt)          (cd .. && $(TAR) jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt)
 endif  endif
   
   imachback: imachback.o 
           $(CC) $(LFLAGS) -DBACKCASTWO -o imachback imachback.o
   ifdef _macosx
           $(DSYMUTIL) imachback
   endif
   
   imachback.o : imachback.c version.h
           $(CC)  $(CFLAGS) $(CROSSCOMPILATION)  -c $<
   
 imachopt.o : imach.c version.h  imachopt.o : imach.c version.h
         $(CC) $(CFLAGSOPT) $(CROSSCOMPILATION) -o imachopt.o -c imach.c          $(CC) $(CFLAGSOPT) $(CROSSCOMPILATION) -o imachopt.o -c imach.c
 #       $(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c  #       $(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c
Line 468  imachopt.o : imach.c version.h Line 648  imachopt.o : imach.c version.h
 imachUB : imach32 imach64  imachUB : imach32 imach64
         lipo -create -arch i386 imach_32 -arch x86_64 imach_64 -output imach$(VERSION)          lipo -create -arch i386 imach_32 -arch x86_64 imach_64 -output imach$(VERSION)
   
   imachrpm : imachopt.o 
           pwd
           (cd ../build && rm -r gnulinux && mkdir gnulinux && cd gnulinux ;\
           pwd ;\
           cmake ../..;\
           cmake --build . ; \
           echo $(OSTYPE);\
           cpack -D CPACK_RPM_PACKAGE_DEBUG=1 -D CPACK_RPM_SPEC_INSTALL_POST="/bin/true" -G RPM;\
           cp  imach-$(VERSION)-*.rpm ../../src/Output/ ;)
   
 #imachdmg : imachopt.o create-dmg applet IMaChInfo.plist.in IMaChPkgInfo.in IMaCh.icns main.scpt.in IMaCh-ecrandemarrage.rsrc TXT.rtf  #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  #       $(CC) $(LFLAGSOPT) -o imach imachopt.o
         #hdiutil detach /Volumes/IMaCh\ $(VERSION)  #       #hdiutil detach /Volumes/IMaCh\ $(VERSION)
 #       cp ../../distributions/osx/gnuplot_bin/gnuplot_2_6_5_OSX imach$(VERSION).app/Contents/Resources/bin/gnuplot;\  #       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  imachdmg : imachopt.o ../distributions/osx/create-dmg ../distributions/osx/createdmg4.sh ../distributions/osx/IMaChInfo.plist.in ../distributions/osx/IMaChPkgInfo.in ../distributions/osx/IMaCh.icns  ../distributions/osx/TXT.rtf
         pwd          pwd
         (cd ../build && rm -r osx && mkdir osx && cd osx ;\          (cd ../build && rm -r osx && mkdir osx && cd osx ;\
         pwd ;\          pwd ;\
Line 485  imachdmg : imachopt.o ../distributions/o Line 674  imachdmg : imachopt.o ../distributions/o
         mkdir -p imach$(VERSION).app;\          mkdir -p imach$(VERSION).app;\
         mkdir -p imach$(VERSION).app/Contents;\          mkdir -p imach$(VERSION).app/Contents;\
         mkdir -p imach$(VERSION).app/Contents/MacOS;\          mkdir -p imach$(VERSION).app/Contents/MacOS;\
         cp ../../distributions/osx/applet imach$(VERSION).app/Contents/MacOS;\          cp ../../distributions/osx/imach imach$(VERSION).app/Contents/MacOS;\
         mkdir -p imach$(VERSION).app/Contents/Resources;\          mkdir -p imach$(VERSION).app/Contents/Resources;\
         mkdir -p imach$(VERSION).app/Contents/Resources/Scripts;\          mkdir -p imach$(VERSION).app/Contents/Resources/Scripts;\
         mkdir -p imach$(VERSION).app/Contents/Resources/bin;\          mkdir -p imach$(VERSION).app/Contents/Resources/bin;\
         mkdir -p imach$(VERSION).app/Contents/Resources/html;\          mkdir -p imach$(VERSION).app/Contents/Resources/lib;\
           mkdir -p imach$(VERSION).app/Contents/Resources/doc;\
         cp IMaCh-$(VERSION) imach$(VERSION).app/Contents/Resources/bin/imach;\          cp IMaCh-$(VERSION) imach$(VERSION).app/Contents/Resources/bin/imach;\
         cp ../../distributions/osx/gnuplot_bin/gnuplot_5_1_OSX imach$(VERSION).app/Contents/Resources/bin/gnuplot;\          cp ../../distributions/osx/gnuplot_bin/bin/gnuplot imach$(VERSION).app/Contents/Resources/bin/gnuplot;\
           cp ../../distributions/osx/gnuplot_bin/lib/* imach$(VERSION).app/Contents/Resources/lib;\
         mkdir -p imach$(VERSION).app/Contents/Resources/description.rtfd;\          mkdir -p imach$(VERSION).app/Contents/Resources/description.rtfd;\
         cp -p ../../distributions/osx/TXT.rtf 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 ;\          $(SED) -e "s/@VERSION@/$(VERSION)/g;" ../../distributions/osx/IMaChInfo.plist.in  >imach$(VERSION).app/Contents/Info.plist ;\
         cp -p ../../distributions/osx/IMaChPkgInfo.in  imach$(VERSION).app/Contents/PkgInfo ;\          cp -p ../../distributions/osx/IMaChPkgInfo.in  imach$(VERSION).app/Contents/PkgInfo ;\
         cp -p ../../distributions/osx/IMaCh.icns  imach$(VERSION).app/Contents/Resources/applet.icns ;\          cp -p ../../distributions/osx/IMaCh.icns  imach$(VERSION).app/Contents/Resources/IMaCh.icns ;\
         cp -r -p ../../distributions/osx/main.scpt.in imach$(VERSION).app/Contents/Resources/Scripts/main.scpt ;\          cp ../../html/doc/data1.txt  imach$(VERSION).app/Contents/Resources/doc ;\
         cp ../../distributions/osx/IMaCH-ecrandemarrage.rsrc imach$(VERSION).app/Contents/Resources/applet.rsrc ;\          cp ../../html/doc/biaspar.log  imach$(VERSION).app/Contents/Resources/doc ;\
         cp ../../html/doc/data1.txt  imach$(VERSION).app/Contents/Resources/html ;\          cp ../../html/doc/biaspar.imach  imach$(VERSION).app/Contents/Resources/doc ;\
         cp ../../html/doc/biaspar.log  imach$(VERSION).app/Contents/Resources/html ;\          cp ../../src/README.txt  imach$(VERSION).app/Contents/Resources/doc ;\
         cp ../../html/doc/biaspar.imach  imach$(VERSION).app/Contents/Resources/html ;\  
         rm -f imach$(VERSION).dmg ;\          rm -f imach$(VERSION).dmg ;\
         pwd ;\          pwd ;\
         cp ../../distributions/osx/createdmg3.sh . ;\          cp ../../distributions/osx/createdmg4.sh . ;\
         cp ../../distributions/osx/Background.png .;\          cp ../../distributions/osx/Background.png .;\
         pwd ;\          pwd ;\
         ./createdmg3.sh  --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION) ;\          ./createdmg4.sh  --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION) ;\
         mv  imach$(VERSION).dmg ../../src/Output/ ;)          cp  imach$(VERSION).dmg ../../src/Output/ ;)
 #       ./create-dmg --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION).app   #       ./create-dmg --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION).app 
 #       ./createdmg2.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION)  #       ./createdmg2.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION)
   
 md5:  md5:
         ls Output/* | xargs md5sum          ls Output/* | xargs md5sum
 upload:  upload:
         rsync -v Output/IMaCh-0.98r2-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download  #       rsync -v Output/imach-0.98r4-1.x86_64.rpm 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/IMaCh-0.99a3-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
   #       rsync -v Output/imach0.99a3.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
   #       rsync -v Output/IMaCh-0.98r7-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
   #       rsync -v Output/imach0.98r7.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
   #       rsync -v Output/imach-0.99r9-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
   #       rsync -v Output/imach0.99r9.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
           rsync -v Output/imach-0.99r18-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
           rsync -v Output/imach0.99r18.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
   #       rsync -v Output/imach0.99r12-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 #       rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/Download  #       rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/Download
   
 imachcyg : imachcyg.o  imachcyg : imachcyg.o
Line 534  imach.exe : imachw32.o Line 732  imach.exe : imachw32.o
         i386-mingw32-gcc  -mwindows -o imach.exe -lm imachw32.o          i386-mingw32-gcc  -mwindows -o imach.exe -lm imachw32.o
         i386-mingw32-strip imach.exe          i386-mingw32-strip imach.exe
   
   valgrindtoto: valgrindtoto.c
           gcc -o valgrindtoto -DCROSS=0 -g valgrindtoto.c
   valgrindtototest: valgrindtoto
           valgrind  --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ./valgrindtoto
   
 valgrind-test :  imach $(TESTFILE)   valgrind-test :  imach $(TESTFILE) 
         valgrind  --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ./imach $(TESTFILE)          valgrind  --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ./imach $(TESTFILE)
   #       valgrind  --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ./imach-0.98r-powellf1f3linmnb $(TESTFILE)
   # gdb -ex=r --args myprogram arg1 arg2
   # gdb -batch -x /tmp/cmds --args executablename arg1 arg2 arg3
   #  gdb -ex=r --args imachback /Users/nbrouard/Documents/Recherches/HRS/RAND_HRS/imachb.imach
   btest:  imachback $(TESTFILE) 
           gdb ./imachback $(TESTFILE)
 test:  imach $(TESTFILE)   test:  imach $(TESTFILE) 
         gdb ./imach $(TESTFILE)          gdb ./imach $(TESTFILE)
   
Removed from v.1.74  
changed lines
  Added in v.1.84

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>