--- imach/src/Makefile	2006/03/14 18:17:42	1.20
+++ imach/src/Makefile	2006/03/15 17:43:00	1.21
@@ -1,146 +1,155 @@
-#CC= gcc -v
-CC= gcc
-
-# Mac OS/X version
-#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
-#WINDOWS#_
-LFLAGS= -g -mno-cygwin
-CFLAGS= -g -mno-cygwin
-LFLAGSOPT= -O3 -mno-cygwin
-CFLAGSOPT= -O3 -mno-cygwin
-UNIX2DOS= unix2dos
-
-# Linux version
-#LINUX#_
-#LINUX#_CFLAGS= -g -DUNIX
-#LINUX#_LFLAGS= -g -lm
-#LINUX#_CFLAGSOPT= -O3 -DUNIX -lm
-#LINUX#_LFLAGSOPT= -O3 -lm
-#UNIX2DOS= unix2dos
-
-SED= sed
-PACKAGE=imach
-PROGRAM=IMaCh
-##ifdef DICTLANGUAGE
-  DICTNAME=$(PACKAGE) $(DICTLANGUAGE) Dictionary
-##else
-##  ISERROR=1
-##endif
-
-##SETUPCOMP=start /wait "C:\Program\ Files\\Compil32.exe"
-
-#SETUPCOMP= echo 
-# Linux
-#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-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
-APPLICATION=IMaCh
-APPNAME=$(APPLICATION)-$(VERSION)
-VERSION=0.98d
-GNUPLOTVERSION=4.0
-IMACHSETUPVERSION=1
-LICENSE=Copying
-COPYRIGHT=Copyright (C)  2002-2006 INED-EUROREVES-Institut de longévité
-TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe
-LICENSEFILE=$(LICENSE)
-INFOBEFOREFILE=README.txt
-
-$(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; \
-		s/@LICENSEFILE@/$(LICENSEFILE)/g; \
-		s/@PACKAGE@/$(PACKAGE)/g; \
-		s/@DICTLANG@/$(DICTLANG)/g; \
-	   	s/@VERMAJOR@/$(VERMAJOR)/g; \
-		s/@COPYRIGHT@/$(COPYRIGHT)/g;" \
-		$(TMPSCRIPTIN) > $(TMPSETUPSCRIPT)
-	$(UNIX2DOS) $(TMPSETUPSCRIPT)
-
-$(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; \
-		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.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 
-	$(CC) $(LFLAGS) -o imach imach.o
-imach.o : imach.c 
-	$(CC) $(CFLAGS) -c imach.c
-
-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  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
-imach.exe : imachw32.o 
-	i386-mingw32-gcc  -mwindows -o imach.exe -lm imachw32.o
-	i386-mingw32-strip imach.exe
-
-
-$(PARAM).htm: imach $(PARAM).imach data1.txt
-	./imach $(PARAM).imach
-
-clean: 
-	rm or$(PARAM).txt er$(PARAM).txt pijr$(PARAM).txt plr$(PARAM).txt \
-	r$(PARAM).txt tr$(PARAM).txt vpl$(PARAM).txt pr$(PARAM).txt \
-	vr$(PARAM).txt *.gif imach.exe imach.o
-
-
+VERSION=0.98d
+COPYRIGHT=Copyright (C)  2002-2006 INED-EUROREVES-Institut de longévité
+IMACHSETUPVERSION=1
+
+# make _linux=1 imachopt
+# make _linux=1 imach
+
+# make _macosx=1
+
+#        Windows
+# make _windows=1 imachcyg
+# make _windows=1 imach-setup.exe
+# make _windows=1 imach-noreg-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"
+
+#CC= gcc -v
+CC= gcc
+
+ifdef _macosx
+# Mac OS/X version
+LFLAGS= -O3 -lm -DUNIX
+CFLAGS= -O3 -DUNIX
+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
+endif
+
+ifdef _windows
+# Windows cygwin version
+LFLAGS= -g -mno-cygwin
+CFLAGS= -g -mno-cygwin
+LFLAGSOPT= -O3 -mno-cygwin
+CFLAGSOPT= -O3 -mno-cygwin
+UNIX2DOS= unix2dos
+SETUPCOMP= Compil32 
+##SETUPCOMP=start /wait "C:\Program\ Files\\Compil32.exe"
+##SETUPCOMP=  "C:\Program Files\Inno Setup 4\Compil32.exe"
+endif
+
+ifdef _linux
+CFLAGS= -g -DUNIX
+LFLAGS= -g -lm
+CFLAGSOPT= -O3 -DUNIX
+LFLAGSOPT= -O3 -lm
+UNIX2DOS= unix2dos
+SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe"
+endif
+
+SED= sed
+PACKAGE=imach
+PROGRAM=IMaCh
+
+
+
+TMPSETUPSCRIPT=setup.iss
+TMPNOREGSETUPSCRIPT=noreg-setup.iss
+TMPSCRIPTIN=setup.iss.in
+APPLICATION=IMaCh
+APPNAME=$(APPLICATION)-$(VERSION)
+GNUPLOTVERSION=4.0
+LICENSE=Copying
+TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe
+LICENSEFILE=$(LICENSE)
+INFOBEFOREFILE=README.txt
+
+$(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; \
+		s/@LICENSEFILE@/$(LICENSEFILE)/g; \
+		s/@PACKAGE@/$(PACKAGE)/g; \
+		s/@DICTLANG@/$(DICTLANG)/g; \
+	   	s/@VERMAJOR@/$(VERMAJOR)/g; \
+		s/@COPYRIGHT@/$(COPYRIGHT)/g;" \
+		$(TMPSCRIPTIN) > $(TMPSETUPSCRIPT)
+	$(UNIX2DOS) $(TMPSETUPSCRIPT)
+
+$(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; \
+		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.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 
+	$(CC) $(LFLAGS) -o imach imach.o
+imach.o : imach.c 
+	$(CC) $(CFLAGS) -c imach.c
+
+imachopt : imachopt.o 
+	$(CC) $(LFLAGSOPT) -o imachopt imachopt.o
+	ln -f imachopt imach
+imachopt.o : imach.c 
+	$(CC) $(CFLAGSOPT) -o imachopt.o -c imach.c
+
+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  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
+imach.exe : imachw32.o 
+	i386-mingw32-gcc  -mwindows -o imach.exe -lm imachw32.o
+	i386-mingw32-strip imach.exe
+
+
+$(PARAM).htm: imach $(PARAM).imach data1.txt
+	./imach $(PARAM).imach
+
+clean: 
+	rm or$(PARAM).txt er$(PARAM).txt pijr$(PARAM).txt plr$(PARAM).txt \
+	r$(PARAM).txt tr$(PARAM).txt vpl$(PARAM).txt pr$(PARAM).txt \
+	vr$(PARAM).txt *.gif imach.exe imach.o
+
+