--- imach/src/Makefile	2006/01/27 20:17:30	1.16
+++ imach/src/Makefile	2006/02/09 14:27:09	1.18
@@ -55,7 +55,7 @@ TMPSCRIPTIN=setup.iss.in
 APPNAME=IMaCh
 VERSION=0.98b
 GNUPLOTVERSION=4.0
-IMACHSETUPVERSION=1
+IMACHSETUPVERSION=2
 LICENSE=Copying
 COPYRIGHT=Copyright (C)  2002-2006 INED-EUROREVES-Institut de longévité
 TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe
@@ -66,6 +66,7 @@ $(TMPSETUPSCRIPT): $(TMPSCRIPTIN)
 	$(SED) -e "s/@APPNAME@/$(APPNAME)/g; \
 		s/@NOTINNOREG@//g; \
 		s/@NOREG@//g; \
+		s/@IMACHSETUPVERSION@/$(IMACHSETUPVERSION)/g; \
 		s/@VERSION@/$(VERSION)/g; \
 		s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \
 		s/@INFOBEFOREFILE@/$(INFOBEFOREFILE)/g; \
@@ -81,6 +82,7 @@ $(TMPNOREGSETUPSCRIPT): $(TMPSCRIPTIN)
 	$(SED) -e "s/@APPNAME@/$(APPNAME)/g; \
 		s/@NOTINNOREG@/\\;/g; \
 		s/@NOREG@/noreg-/g; \
+		s/@IMACHSETUPVERSION@/$(IMACHSETUPVERSION)/g; \
 		s/@VERSION@/$(VERSION)/g; \
 		s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \
 		s/@INFOBEFOREFILE@/$(INFOBEFOREFILE)/g; \
@@ -100,10 +102,12 @@ $(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRI
 
 PARAM=mypar1
 
-imachcyg-setup : imachcygopt imachcygopt.o setup.iss.in $(TMPSETUPEXE)
+imachcyg-setup: imachcygopt.exe setup.iss
+	$(SETUPCOMP) /cc $(TMPSETUPSCRIPT)
 
 # 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)
+imachcyg-noreg-setup: imachcygopt.exe noreg-setup.iss
+	$(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
 
 imach : imach.o 
 	$(CC) $(LFLAGS) -o imach imach.o
@@ -114,8 +118,8 @@ imachcyg : imachcyg.o
 	$(CC) $(LFLAGS) -o imach imachcyg.o
 imachcyg.o : imach.c 
 	$(CC) $(CFLAGS)  -c -o imachcyg.o imach.c
-imachcygopt : imachcygopt.o  
-	$(CC) $(LFLAGSOPT) -o imach.exe imachcygopt.o
+imachcygopt.exe : imachcygopt.o  
+	$(CC) $(LFLAGSOPT) -o imachcygopt.exe imachcygopt.o
 imachcygopt.o : imach.c 
 	$(CC) $(CFLAGSOPT) -c -o imachcygopt.o imach.c