imach/src/Makefile - diff

Return to Makefile CVS log

Up to [Local Repository] / imach / src

Diff for /imach/src/Makefile between versions 1.57 and 1.59

version 1.57, 2015/03/11 13:43:20	version 1.59, 2015/04/29 09:11:01
Line 1	Line 1
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	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	#IMACHSETUPVERSION=mvc

# Linux	# Linux
Line 44 IMACHSETUPVERSION=ilc	Line 44 IMACHSETUPVERSION=ilc
#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/carol/carol-june2014/educadlmwt24.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/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-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 54 GCC= gcc	Line 55 GCC= gcc
ifdef _macosx	ifdef _macosx
# Mac OS/X version	# Mac OS/X version
LFLAGS= -g -lm	LFLAGS= -g -lm
CFLAGS= -g -DDEBUG	#CFLAGS= -g -DDEBUG
	CFLAGS= -g
LFLAGSOPT= -O3 -lm	LFLAGSOPT= -O3 -lm
CFLAGSOPT= -O3	CFLAGSOPT= -O3
	CP= cp
CROSSCOMPILATION= -DCROSS=0	CROSSCOMPILATION= -DCROSS=0
UNIX2DOS= echo "Unix2dos "	UNIX2DOS= echo "Unix2dos "
DSYMUTIL= dsymutil	DSYMUTIL= dsymutil
Line 208 endif	Line 211 endif
ifdef _linux	ifdef _linux
#CFLAGS= -g -DUNIX -DDEBUGHESS	#CFLAGS= -g -DUNIX -DDEBUGHESS
#CFLAGS= -g -DDEBUG -DFIXMNBRAK	#CFLAGS= -g -DDEBUG -DFIXMNBRAK
CFLAGS= -g -DDEBUG	#CFLAGS= -g -DDEBUG
	CFLAGS= -g
LFLAGS= -g -lm	LFLAGS= -g -lm
IGSL= -I/usr/include/gsl	IGSL= -I/usr/include/gsl
LGSL= -lgsl -lgslcblas	LGSL= -lgsl -lgslcblas
Line 276 $(TMPNOREGSETUPSCRIPT): $(TMPSCRIPTIN)	Line 280 $(TMPNOREGSETUPSCRIPT): $(TMPSCRIPTIN)
$(TMPSETUPEXE): $(TMPSETUPSCRIPT)	$(TMPSETUPEXE): $(TMPSETUPSCRIPT)
$(SETUPCOMP) /cc $(TMPSETUPSCRIPT)	$(SETUPCOMP) /cc $(TMPSETUPSCRIPT)

$(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRIPT)	#$(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRIPT)
$(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)	# $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)

PARAM=mypar1	PARAM=mypar1

Line 310 imachILC64-setup: IMaCh-ilc64-$(VERSION)	Line 314 imachILC64-setup: IMaCh-ilc64-$(VERSION)

imachILC64-noreg-setup: IMaCh-ilc64-$(VERSION).exe noreg-setup.iss	imachILC64-noreg-setup: IMaCh-ilc64-$(VERSION).exe noreg-setup.iss
touch setup.iss.in	touch setup.iss.in
$(CP) IMaCh-ilc64-$(VERSION).exe imach.exe
$(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)	$(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
$(CP) Output/$(TMPSETUPEXE) imachILC64-noreg-setup	$(CP) Output/$(TMPSETUPEXE) imachILC64-noreg-setup

Line 330 imachMVC-setup: imachMVC.exe setup.iss	Line 333 imachMVC-setup: imachMVC.exe setup.iss
touch setup.iss.in	touch setup.iss.in
$(CP) imachMVC.exe imach.exe	$(CP) imachMVC.exe imach.exe
$(SETUPCOMP) /cc setup.iss	$(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)	# imachcyg-noreg-setup : imachcygopt imachcygopt.o setup.iss.in noreg-setup.iss $(TMPNOREGSETUPEXE)
imachMVC-noreg-setup: imachMVC.exe noreg-setup.iss	imachMVC-noreg-setup: imachMVC.exe noreg-setup.iss
Line 357 ifdef _macosx	Line 360 ifdef _macosx
endif	endif

imach.o : imach.c	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	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 imachtest.o -c imach.c
Line 397 imachBOBYQAopt.o : imach.c	Line 401 imachBOBYQAopt.o : imach.c

imachopt : imachopt.o	imachopt : imachopt.o
$(CC) $(LFLAGSOPT) -o imachopt imachopt.o	$(CC) $(LFLAGSOPT) -o imachopt imachopt.o
ln -f imachopt imach	# ln -f imachopt imach
$(CP) imachopt Output/imachopt$(VERSION)-$(BINVERSION)	$(CP) imachopt Output/imachopt$(VERSION)-$(BINVERSION)
$(CP) -f imach ../bin	$(CP) -f imach ../bin
ifdef _intel64onosx	ifdef _intel64onosx
Line 453 imachdmg : imachopt.o create-dmg applet	Line 457 imachdmg : imachopt.o create-dmg applet
# ./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)

upload:	md5:
ls Output/* \| xargs md5sum	ls Output/* \| xargs md5sum
	upload:
rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/	rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/

imachcyg : imachcyg.o	imachcyg : imachcyg.o

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

Removed from v.1.57
changed lines
	Added in v.1.59