===================================================================
RCS file: /home/cvs/OpenXM/src/cfep/package/Makefile,v
retrieving revision 1.6
retrieving revision 1.18
diff -u -p -r1.6 -r1.18
--- OpenXM/src/cfep/package/Makefile	2007/02/22 07:49:25	1.6
+++ OpenXM/src/cfep/package/Makefile	2011/07/14 11:39:32	1.18
@@ -1,6 +1,6 @@
 # Moved from misc-2005/12/xcode/Makefile.
-BUILD=${HOME}/tmp/misc-2005/A1/cfep/build
 OpenXM_HOME=${HOME}/OX4/OpenXM
+BUILD=${OpenXM_HOME}/src/cfep/build
 usage:
 	@echo ${BUILD}
 	@echo "setup-cfep (developer), clean, "
@@ -13,18 +13,18 @@ setup-cfep:
 	rm -f ${BUILD}/Debug/cfep.app/OpenXM
 	rm -rf ${BUILD}/Release/cfep.app/OpenXM
 	mkdir -p ${BUILD}/Debug/cfep.app
-	(cd ${BUILD}/Debug/cfep.app ; ln -s ${OpenXM_HOME} .)
+	(cd ${BUILD}/Debug/cfep.app ; ln -s ~/OX4/OpenXM .)
 	mkdir -p ${BUILD}/Release/cfep.app
-	(cd ${BUILD}/Release/cfep.app ; ln -s ${OpenXM_HOME} .)
+	(cd ${BUILD}/Release/cfep.app ; ln -s ~/OX4/OpenXM .)
 	rm -f ${BUILD}/Default/cfep.app/OpenXM
 	mkdir -p ${BUILD}/Default/cfep.app
-	(cd ${BUILD}/Default/cfep.app ; ln -s ${OpenXM_HOME} .)
+	(cd ${BUILD}/Default/cfep.app ; ln -s ~/OX4/OpenXM .)
 	make setup-cfep-fix
 # To debug html intro at ../doc
 	(cd ../doc ; ln -s ${OpenXM_HOME}/doc/cfep/html-ja_JP.utf8 .)
-	cp `which nkf` ${OpenXM_HOME}/bin
+	-cp `which nkf` ~/OX4/OpenXM/bin
 setup-cfep-fix:
-	(rm -f ${OpenXM_HOME}/lib/asir/cfep-init.rr ; cd ${OpenXM_HOME}/lib/asir ; ln -s ${OpenXM_HOME}/src/asir-contrib/packages/src/cfep-init.rr .)
+	(rm -f ~/OX4/OpenXM/lib/asir/cfep-init.rr ; cd ~/OX4/OpenXM/lib/asir ; ln -s ~/OX4/OpenXM/src/asir-contrib/packages/src/cfep-init.rr .)
 
 install:  cfep-grep
 	mkdir -p ${OpenXM_HOME}/doc/cfep
@@ -35,20 +35,22 @@ install:  cfep-grep
 	cp cfep.init ${OpenXM_HOME}/lib/cfep
 	cp cfep-grep ${OpenXM_HOME}/bin
 	cp ../tests/cfep-opengl.rr ${OpenXM_HOME}/lib/asir-contrib
-	cp `which nkf` ~/OX4/OpenXM/bin
+	-cp `which nkf` ~/OX4/OpenXM/bin
 
 clean:
-	rm -f tmp-* gendoc cfep-grep
+	rm -f tmp-* gendoc cfep-grep ../doc/html-ja_JP.utf8
+
 dist-cfep: gentar install
 	rm -rf work
 	mkdir work
+	-cp install.txt work
 	(cd work ; (cd ${OpenXM_HOME}/.. ; \
 		  tar cf - OpenXM/lib/libgc* OpenXM/lib/libgmp* OpenXM/rc \
-		    OpenXM/bin/ox OpenXM/bin/ox_asir OpenXM/bin/asir \
+		    OpenXM/bin \
 			OpenXM/lib/cfep OpenXM/lib/sm1/bin \
 			OpenXM/doc/cfep )  | tar xvf -)
 	(cd work ; (cd ${OpenXM_HOME}/.. ; \
-		  tar cf - --exclude help --exclude help-jp --exclude help-eg  OpenXM/lib/asir  )  | tar xvf -)
+		  tar cf - --exclude help --exclude help-ja --exclude help-en  OpenXM/lib/asir  )  | tar xvf -)
 	(cd work/OpenXM/rc ; make clean)
 	rm -rf work/OpenXM/lib/asir/help* work/OpenXM/lib/asir/cfep-init.rr
 	mkdir work/OpenXM/lib/asir-contrib
@@ -68,6 +70,7 @@ dist-cfep: gentar install
 	(cp ${OpenXM_HOME}/bin/nkf work/OpenXM/bin)
 	(cp ${OpenXM_HOME}/bin/sm1 work/OpenXM/bin)
 	(cp ${OpenXM_HOME}/bin/ox_k0 work/OpenXM/bin)
+	(cp ${OpenXM_HOME}/bin/ox_cpp work/OpenXM/bin)
 	(mkdir -p work/OpenXM/lib/sm1 ; cp -r ${OpenXM_HOME}/lib/sm1/*.sm1 work/OpenXM/lib/sm1)
 	(cp ${OpenXM_HOME}/lib/sm1/*.asir work/OpenXM/lib/sm1)
 	(cp -r ${OpenXM_HOME}/lib/sm1/Resource work/OpenXM/lib/sm1)
@@ -96,7 +99,7 @@ gentar:
 # Do it at orange2
 gentar-html:
 	@if [ ! -f tmp-OpenXM-html.tar.gz ]; then \
-		(cd /home/web/OpenXM/Current ; tar czvf - doc/asir2000/html-jp) >tmp-OpenXM-html.tar.gz ; \
+		(cd /home/web/OpenXM/Current ; tar czvf - doc/asir2000/html-ja) >tmp-OpenXM-html.tar.gz ; \
 	fi 
 
 copy-intro-ja:
@@ -111,3 +114,11 @@ gendoc: gendoc.c
 cfep-grep: cfep-grep.c
 	gcc -o cfep-grep -I${OpenXM_HOME}/include cfep-grep.c -L${OpenXM_HOME}/lib -lox_pathfinder
 
+copy-all-tmp:
+	mkdir -p work/OpenXM/share
+	-(cp ${OpenXM_HOME}/bin/[a-z]* work/OpenXM/bin)
+	-(cp ${OpenXM_HOME}/lib/[a-z]* work/OpenXM/lib)
+	-(cp -r ${OpenXM_HOME}/lib/java-support work/OpenXM/lib)
+	-(cp -r ${OpenXM_HOME}/share/oxmgraph work/OpenXM/share)
+#	-(cp -r ${OpenXM_HOME}/libexec work/OpenXM )
+	rm -f work/OpenXM/bin/gnuplot