--- imach/src/Makefile	2005/10/25 12:30:27	1.15
+++ imach/src/Makefile	2006/01/27 20:17:30	1.16
@@ -2,26 +2,27 @@
 CC= gcc
 
 # Mac OS/X version
-LFLAGS= -O3 -lm -DUNIX
-CFLAGS= -O3 -DUNIX
-UNIX2DOS= echo "Unix2dos " 
+#MACOSX#_LFLAGS= -O3 -lm -DUNIX
+#MACOSX#_CFLAGS= -O3 -DUNIX
+#MACOSX#_UNIX2DOS= echo "Unix2dos " 
 # Don'know how to launch imach098.pmsp in batch to create package file imach098Panther.pkg
 # ./createdmg.sh imach imach098panther ./imach098Panther
 # and directory ./imach098Panther contains package file imach098Panther.pkg
 
 # Windows cygwin version
-#LFLAGS= -g -mno-cygwin
-#CFLAGS= -g
-
-#LFLAGS= -O3 -mno-cygwin
-#CFLAGS= -O3 -mno-cygwin
-#LFLAGS= -g -lm
-#CFLAGS= -g 
-#UNIX2DOS= unix2dos
+#WINDOWS#_
+LFLAGS= -g -mno-cygwin
+CFLAGS= -g -mno-cygwin
+LFLAGSOPT= -O3 -mno-cygwin
+CFLAGSOPT= -O3 -mno-cygwin
+UNIX2DOS= unix2dos
 
 # Linux version
-#LFLAGS= -O3 -lm
-#CFLAGS= -O3 
+#LINUX#_
+#LINUX#_CFLAGS= -g -DUNIX
+#LINUX#_LFLAGS= -g -lm
+#LINUX#_CFLAGSOPT= -O3 -DUNIX -lm
+#LINUX#_LFLAGSOPT= -O3 -lm
 #UNIX2DOS= unix2dos
 
 SED= sed
@@ -37,30 +38,34 @@ PROGRAM=IMaCh
 
 #SETUPCOMP= echo 
 # Linux
-#SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe"
+#LINUX#_SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe"
 ##SETUPCOMP=  "C:\Program Files\Inno Setup 4\Compil32.exe"
+
 #Windows cygwin
 # make imachcyg
-# make imach-setupe.exe
-# sortie dans Outpu/setup.exe
-# ln -s /cygdrive/c/Program\ Files/Inno\ Setup\ 3/Compil32.exe /usr/local/bin/Compil32
+# make imach-setup.exe
+# sortie dans Output/setup.exe
+# ln -s /cygdrive/c/Program\ Files/Inno\ Setup\ 4/Compil32.exe /usr/local/bin/Compil32
 ##SETUPCOMP=  "C:\Program Files\Inno Setup 3\Compil32.exe"
+
 SETUPCOMP= Compil32 
 TMPSETUPSCRIPT=setup.iss
+TMPNOREGSETUPSCRIPT=noreg-setup.iss
 TMPSCRIPTIN=setup.iss.in
 APPNAME=IMaCh
-VERSION=0.98
+VERSION=0.98b
 GNUPLOTVERSION=4.0
-IMACHSETUPVERSION=2
+IMACHSETUPVERSION=1
 LICENSE=Copying
-COPYRIGHT=Copyright (C)  2002-2003-2004-2005 INED-EUROREVES-Institut de longévité
-#TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe
-TMPSETUPEXE=imach-setup.exe
+COPYRIGHT=Copyright (C)  2002-2006 INED-EUROREVES-Institut de longévité
+TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe
 LICENSEFILE=$(LICENSE)
-INFOBEFOREFILE=Readme.txt
+INFOBEFOREFILE=README.txt
 
 $(TMPSETUPSCRIPT): $(TMPSCRIPTIN)
 	$(SED) -e "s/@APPNAME@/$(APPNAME)/g; \
+		s/@NOTINNOREG@//g; \
+		s/@NOREG@//g; \
 		s/@VERSION@/$(VERSION)/g; \
 		s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \
 		s/@INFOBEFOREFILE@/$(INFOBEFOREFILE)/g; \
@@ -72,20 +77,47 @@ $(TMPSETUPSCRIPT): $(TMPSCRIPTIN)
 		$(TMPSCRIPTIN) > $(TMPSETUPSCRIPT)
 	$(UNIX2DOS) $(TMPSETUPSCRIPT)
 
+$(TMPNOREGSETUPSCRIPT): $(TMPSCRIPTIN)
+	$(SED) -e "s/@APPNAME@/$(APPNAME)/g; \
+		s/@NOTINNOREG@/\\;/g; \
+		s/@NOREG@/noreg-/g; \
+		s/@VERSION@/$(VERSION)/g; \
+		s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \
+		s/@INFOBEFOREFILE@/$(INFOBEFOREFILE)/g; \
+		s/@LICENSEFILE@/$(LICENSEFILE)/g; \
+		s/@PACKAGE@/$(PACKAGE)/g; \
+		s/@DICTLANG@/$(DICTLANG)/g; \
+	   	s/@VERMAJOR@/$(VERMAJOR)/g; \
+		s/@COPYRIGHT@/$(COPYRIGHT)/g;" \
+		$(TMPSCRIPTIN) > $(TMPNOREGSETUPSCRIPT)
+	$(UNIX2DOS) $(TMPNOREGSETUPSCRIPT)
+
 $(TMPSETUPEXE): $(TMPSETUPSCRIPT)
 	$(SETUPCOMP) /cc $(TMPSETUPSCRIPT)
 
+$(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRIPT)
+	$(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
+
 PARAM=mypar1
 
+imachcyg-setup : imachcygopt imachcygopt.o setup.iss.in $(TMPSETUPEXE)
+
+# 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)
+
 imach : imach.o 
 	$(CC) $(LFLAGS) -o imach imach.o
 imach.o : imach.c 
 	$(CC) $(CFLAGS) -c imach.c
 
-imachcyg : imachcyg.o  $(TMPSETUPSCRIPT) 
-	$(CC) -mno-cygwin -o imach imachcyg.o
+imachcyg : imachcyg.o  
+	$(CC) $(LFLAGS) -o imach imachcyg.o
 imachcyg.o : imach.c 
-	$(CC) -mno-cygwin -c -o imachcyg.o imach.c
+	$(CC) $(CFLAGS)  -c -o imachcyg.o imach.c
+imachcygopt : imachcygopt.o  
+	$(CC) $(LFLAGSOPT) -o imach.exe imachcygopt.o
+imachcygopt.o : imach.c 
+	$(CC) $(CFLAGSOPT) -c -o imachcygopt.o imach.c
 
 imachw32.o : imach.c
 	i386-mingw32-gcc -c imach.c -o imachw32.o
@@ -93,8 +125,9 @@ imach.exe : imachw32.o
 	i386-mingw32-gcc  -mwindows -o imach.exe -lm imachw32.o
 	i386-mingw32-strip imach.exe
 
-$(PARAM).htm: imach $(PARAM).txt data1.txt
-	./imach $(PARAM).txt
+
+$(PARAM).htm: imach $(PARAM).imach data1.txt
+	./imach $(PARAM).imach
 
 clean: 
 	rm or$(PARAM).txt er$(PARAM).txt pijr$(PARAM).txt plr$(PARAM).txt \