===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.8
diff -u -p -r1.4 -r1.8
--- OpenXM_contrib2/asir2000/Makefile.am	2003/03/07 15:55:05	1.4
+++ OpenXM_contrib2/asir2000/Makefile.am	2003/03/08 10:55:06	1.8
@@ -1,10 +1,10 @@
-# $OpenXM: OpenXM_contrib2/asir2000/Makefile.am,v 1.3 2003/03/04 06:40:10 ohara Exp $
+# $OpenXM: OpenXM_contrib2/asir2000/Makefile.am,v 1.7 2003/03/08 10:41:18 ohara Exp $
 
 AUTOMAKE_OPTIONS = foreign no-dependencies 1.5
 if USE_PLOT
     PLOTDIR = plot
     PLLIB   = plot/libplot.a
-    X11LIB  = @X_LIBS@ -lXaw -lXmu -lXt @X_PRE_LIBS@ -lXpm -lXext -lX11 @X_EXTRA_LIBS@ 
+    X11LIB  = @X_LIBS@ -lXaw -lXmu -lXt @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ 
 endif
 
 SUBDIRS  = asm builtin engine fft include io lib parse ${PLOTDIR}
@@ -66,35 +66,39 @@ install-exec-hook:
 		mv ${prefix}/bin/asir${EXEEXT} ${prefix}/lib/asir/ ; \
 	fi
 
-install-symlink-openxm:
-	-rm -f ${prefix}/bin/ox_asir${EXEEXT}
-	(cd ${prefix}/bin ; ${LN_S} asir${EXEEXT} ox_asir${EXEEXT})
-	-mkdir -p ${prefix}/lib/asir
-	(cd ${prefix}/lib/asir ; \
-	${LN_S} ../../bin/asir${EXEEXT} asir${EXEEXT} ; \
-	${LN_S} asir${EXEEXT} ox_asir${EXEEXT} ; \
-	${LN_S} asir${EXEEXT} ox_launch${EXEEXT} ; \
-	${LN_S} asir${EXEEXT} ox_plot${EXEEXT})
-
 install-libasir: libasir.a
 	mkdir -p ${prefix}/lib
 	${INSTALL_DATA} libasir.a ${prefix}/lib/libasir${libasir_postfix}.a
 
 install-openxm: asir${EXEEXT} libasir.a libasir-gc.a
+	-mkdir -p ${prefix}/bin
+	${INSTALL_PROGRAM} asir ${prefix}/bin/
 	-mkdir -p ${prefix}/lib/asir
-	${INSTALL_PROGRAM} asir ${prefix}/lib/asir/
 	(cd ${top_srcdir}/lib; ${MAKE} install-doc install-lib)
-	-mkdir -p ${prefix}/lib
 	${INSTALL_DATA} libasir.a    ${prefix}/lib/libasir${libasir_postfix}.a
 	${INSTALL_DATA} libasir-gc.a ${prefix}/lib/libasir-gc.a
+	-rm -f ${prefix}/bin/ox_asir${EXEEXT}
+	(cd ${prefix}/bin ; ${LN_S} asir${EXEEXT} ox_asir${EXEEXT})
+	-(cd ${prefix}/lib/asir; \
+    rm -f asir${EXEEXT} ox_asir${EXEEXT} ox_launch${EXEEXT} ox_plot${EXEEXT})
+	(cd ${prefix}/lib/asir ; \
+	${LN_S} ../../bin/asir${EXEEXT} asir${EXEEXT} ; \
+	${LN_S} asir${EXEEXT} ox_asir${EXEEXT} ; \
+	${LN_S} asir${EXEEXT} ox_launch${EXEEXT} ; \
+	${LN_S} asir${EXEEXT} ox_plot${EXEEXT})
+	(cd ${top_srcdir}/include; ${MAKE} install)
+	(cd ${top_srcdir}/parse; ${MAKE} install)
 
 install-lib:
 	(cd ${top_srcdir}/lib; ${MAKE} install-lib)
+	-(cd ${prefix}/lib/asir; \
+	rm -f ox_asir${EXEEXT} ox_launch${EXEEXT} ox_plot${EXEEXT})
 	(cd ${prefix}/lib/asir ; \
 	${LN_S} asir${EXEEXT} ox_asir${EXEEXT} ; \
 	${LN_S} asir${EXEEXT} ox_launch${EXEEXT} ; \
 	${LN_S} asir${EXEEXT} ox_plot${EXEEXT})
 	-mkdir -p ${prefix}/bin
+	-rm -f ${prefix}/bin/asir${EXEEXT}
 	(cd ${prefix}/bin ; ${LN_S} ../lib/asir/asir${EXEEXT} asir${EXEEXT})
 
 install-doc: