From: Agnès Lièvre <agnes.lievre@education.gouv.fr>
Date: Thu, 9 Feb 2006 20:19:28 +0000 (+0000)
Subject: (Module): IMACHSETUPVERSION added
X-Git-Tag: imach-099s7~518
X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=abcbd794faad6d3fd3ddaeffc699023da314ba59;p=.git

(Module): IMACHSETUPVERSION added
---

diff --git a/src/Makefile b/src/Makefile
index 6a22c8c..be9f5f4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -52,7 +52,8 @@ 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=2
@@ -103,10 +104,12 @@ $(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRIPT)
 PARAM=mypar1
 
 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.exe noreg-setup.iss
+	cp imachcygopt.exe imach.exe
 	$(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
 
 imach : imach.o 
@@ -114,14 +117,16 @@ 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.exe : imachcygopt.o  
-	$(CC) $(LFLAGSOPT) -o imachcygopt.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