From: N. Brouard Date: Tue, 10 Mar 2015 20:35:56 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: imach-099s7~375 X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=2a942d6fed66d4ebb467863b216c0607397a12fa;p=.git *** empty log message *** --- diff --git a/src/Makefile b/src/Makefile index 1e1ae09..e778771 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,5 @@ -VERSION=0.98p -COPYRIGHT=Copyright (C) 2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) +VERSION=0.98q0 +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=ilc64 IMACHSETUPVERSION=mvc @@ -206,7 +206,8 @@ endif ifdef _linux #CFLAGS= -g -DUNIX -DDEBUGHESS -CFLAGS= -g -DDEBUG +#CFLAGS= -g -DDEBUG -DFIXMNBRAK +CFLAGS= -g -DDEBUG LFLAGS= -g -lm IGSL= -I/usr/include/gsl LGSL= -lgsl -lgslcblas @@ -334,14 +335,25 @@ simach : simach.o simach.o : simach.c $(CC) $(CFLAGS) -DGSL -c simach.c -imach : imach.o +imachtest: imachtest.o + $(CC) $(LFLAGS) -o imachtest imachtest.o +ifdef _macosx + $(DSYMUTIL) imachtest +endif + +imach: imach.o $(CC) $(LFLAGS) -o imach imach.o ifdef _macosx $(DSYMUTIL) imach endif imach.o : 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 + +# $(CC) $(CFLAGS) $(CROSSCOMPILATION) -DFIXMNBRAK -o imachtest.o -c imach.c # http://msdn.microsoft.com/en-us/library/abx4dbyh%28v=vs.100%29.aspx imachcl: imach.c