--- imach/src/Makefile	2006/01/27 20:17:30	1.16
+++ imach/src/Makefile	2006/02/09 20:19:28	1.19
@@ -52,10 +52,11 @@ SETUPCOMP= Compil32
 TMPSETUPSCRIPT=setup.iss
 TMPNOREGSETUPSCRIPT=noreg-setup.iss
 TMPSCRIPTIN=setup.iss.in
-APPNAME=IMaCh
+APPLICATION=IMaCh
+APPNAME=$(APPLICATION)-$(VERSION)
 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 +67,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 +83,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,24 +103,30 @@ $(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRI
 
 PARAM=mypar1
 
-imachcyg-setup : imachcygopt imachcygopt.o setup.iss.in $(TMPSETUPEXE)
+imachcyg-setup: imachcygopt.exe setup.iss
+	cp imachcygopt.exe imach.exe
+	$(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
+	cp imachcygopt.exe imach.exe
+	$(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
 
 imach : imach.o 
 	$(CC) $(LFLAGS) -o imach imach.o
 imach.o : imach.c 
 	$(CC) $(CFLAGS) -c imach.c
 
-imachcyg : imachcyg.o  
-	$(CC) $(LFLAGS) -o imach imachcyg.o
+imachcyg : imachcyg.o  strsep.o
+	$(CC) $(LFLAGS) -o imach imachcyg.o strsep.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  strsep.o
+	$(CC) $(LFLAGSOPT) -o imachcygopt.exe imachcygopt.o strsep.o
 imachcygopt.o : imach.c 
 	$(CC) $(CFLAGSOPT) -c -o imachcygopt.o imach.c
+strsep.o : strsep.c 
+	$(CC) $(CFLAGSOPT) -c -o strsep.o strsep.c
 
 imachw32.o : imach.c
 	i386-mingw32-gcc -c imach.c -o imachw32.o