--- imach/src/Makefile	2015/09/01 18:24:28	1.64
+++ imach/src/Makefile	2015/09/02 11:39:21	1.65
@@ -466,35 +466,43 @@ imachUB : imach32 imach64
 
 
 #imachdmg : imachopt.o create-dmg applet IMaChInfo.plist.in IMaChPkgInfo.in IMaCh.icns main.scpt.in IMaCh-ecrandemarrage.rsrc TXT.rtf
-imachdmg : imachopt.o create-dmg applet IMaChInfo.plist.in IMaChPkgInfo.in IMaCh.icns main.scpt.in IMaCh-ecrandemarrage.rsrc TXT.rtf
-	$(CC) $(LFLAGSOPT) -o imach imachopt.o
+#	$(CC) $(LFLAGSOPT) -o imach imachopt.o
 	#hdiutil detach /Volumes/IMaCh\ $(VERSION)
-	rm -rf imach$(VERSION).app
-	mkdir -p imach$(VERSION).app
-	mkdir -p imach$(VERSION).app/Contents
-	mkdir -p imach$(VERSION).app/Contents/MacOS
-	cp applet imach$(VERSION).app/Contents/MacOS
-	mkdir -p imach$(VERSION).app/Contents/Resources
-	mkdir -p imach$(VERSION).app/Contents/Resources/Scripts
-	mkdir -p imach$(VERSION).app/Contents/Resources/bin
-	mkdir -p imach$(VERSION).app/Contents/Resources/html
-	cp imach imach$(VERSION).app/Contents/Resources/bin
-	cp gnuplot_bin/gnuplot_2_6_5_OSX imach$(VERSION).app/Contents/Resources/bin/gnuplot
-	mkdir -p imach$(VERSION).app/Contents/Resources/description.rtfd
-	cp -p TXT.rtf imach$(VERSION).app/Contents/Resources/description.rtfd
-	$(SED) -e "s/@VERSION@/$(VERSION)/g;" \
-	IMaChInfo.plist.in  >imach$(VERSION).app/Contents/Info.plist
-	cp -p IMaChPkgInfo.in  imach$(VERSION).app/Contents/PkgInfo
-	cp -p IMaCh.icns  imach$(VERSION).app/Contents/Resources/applet.icns
-	cp -r -p main.scpt.in imach$(VERSION).app/Contents/Resources/Scripts/main.scpt
-	cp IMaCH-ecrandemarrage.rsrc imach$(VERSION).app/Contents/Resources/applet.rsrc
-	cp ../html/doc/data1.txt  imach$(VERSION).app/Contents/Resources/html
-	cp ../html/doc/biaspar.log  imach$(VERSION).app/Contents/Resources/html
-	cp ../html/doc/biaspar.imach  imach$(VERSION).app/Contents/Resources/html
-	rm -f imach$(VERSION).dmg
-	./createdmg3.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION)
-	mv  imach$(VERSION).dmg Output/
-#	./create-dmg --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION).app
+imachdmg : imachopt.o ../distributions/osx/create-dmg ../distributions/osx/createdmg3.sh ../distributions/osx/applet ../distributions/osx/IMaChInfo.plist.in ../distributions/osx/IMaChPkgInfo.in ../distributions/osx/IMaCh.icns ../distributions/osx/main.scpt.in ../distributions/osx/IMaCh-ecrandemarrage.rsrc ../distributions/osx/TXT.rtf
+	pwd
+	(cd ../build && rm -r osx && mkdir osx && cd osx ;\
+	pwd ;\
+	cmake ../..;\
+	cmake --build . ; \
+	rm -rf imach$(VERSION).app;\
+	mkdir -p imach$(VERSION).app;\
+	mkdir -p imach$(VERSION).app/Contents;\
+	mkdir -p imach$(VERSION).app/Contents/MacOS;\
+	cp ../../distributions/osx/applet imach$(VERSION).app/Contents/MacOS;\
+	mkdir -p imach$(VERSION).app/Contents/Resources;\
+	mkdir -p imach$(VERSION).app/Contents/Resources/Scripts;\
+	mkdir -p imach$(VERSION).app/Contents/Resources/bin;\
+	mkdir -p imach$(VERSION).app/Contents/Resources/html;\
+	cp IMaCh-$(VERSION) imach$(VERSION).app/Contents/Resources/bin/imach;\
+	cp ../../distributions/osx/gnuplot_bin/gnuplot_2_6_5_OSX imach$(VERSION).app/Contents/Resources/bin/gnuplot;\
+	mkdir -p imach$(VERSION).app/Contents/Resources/description.rtfd;\
+	cp -p ../../distributions/osx/TXT.rtf imach$(VERSION).app/Contents/Resources/description.rtfd ;\
+	$(SED) -e "s/@VERSION@/$(VERSION)/g;" ../../distributions/osx/IMaChInfo.plist.in  >imach$(VERSION).app/Contents/Info.plist ;\
+	cp -p ../../distributions/osx/IMaChPkgInfo.in  imach$(VERSION).app/Contents/PkgInfo ;\
+	cp -p ../../distributions/osx/IMaCh.icns  imach$(VERSION).app/Contents/Resources/applet.icns ;\
+	cp -r -p ../../distributions/osx/main.scpt.in imach$(VERSION).app/Contents/Resources/Scripts/main.scpt ;\
+	cp ../../distributions/osx/IMaCH-ecrandemarrage.rsrc imach$(VERSION).app/Contents/Resources/applet.rsrc ;\
+	cp ../../html/doc/data1.txt  imach$(VERSION).app/Contents/Resources/html ;\
+	cp ../../html/doc/biaspar.log  imach$(VERSION).app/Contents/Resources/html ;\
+	cp ../../html/doc/biaspar.imach  imach$(VERSION).app/Contents/Resources/html ;\
+	rm -f imach$(VERSION).dmg ;\
+	pwd ;\
+	cp ../../distributions/osx/createdmg3.sh . ;\
+	cp ../../distributions/osx/Background.png .;\
+	pwd ;\
+	./createdmg3.sh  --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION) ;\
+	mv  imach$(VERSION).dmg ../../src/Output/ ;)
+#	./create-dmg --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION).app 
 #	./createdmg2.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION)
 
 md5: