===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.12
diff -u -p -r1.5 -r1.12
--- OpenXM_contrib2/asir2000/Makefile.in	2003/03/07 15:55:05	1.5
+++ OpenXM_contrib2/asir2000/Makefile.in	2003/03/17 14:33:46	1.12
@@ -13,8 +13,6 @@
 
 @SET_MAKE@
 
-# $OpenXM: OpenXM_contrib2/asir2000/Makefile.in,v 1.4 2003/03/07 03:12:21 noro Exp $
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -72,6 +70,7 @@ FEPLIB = @FEPLIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LAPACKLIB = @LAPACKLIB@
 LN_S = @LN_S@
+MAINT = @MAINT@
 MPIINC = @MPIINC@
 MPILIB = @MPILIB@
 OBJEXT = @OBJEXT@
@@ -80,6 +79,7 @@ PARIINC = @PARIINC@
 PARILIB = @PARILIB@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
+XPMLIB = @XPMLIB@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
@@ -94,7 +94,7 @@ libasir_postfix = @libasir_postfix@
 AUTOMAKE_OPTIONS = foreign no-dependencies 1.5
 @USE_PLOT_TRUE@PLOTDIR = plot
 @USE_PLOT_TRUE@PLLIB = plot/libplot.a
-@USE_PLOT_TRUE@X11LIB = @X_LIBS@ -lXaw -lXmu -lXt @X_PRE_LIBS@ -lXpm -lXext -lX11 @X_EXTRA_LIBS@ 
+@USE_PLOT_TRUE@X11LIB = @X_LIBS@ -lXaw -lXmu -lXt @X_PRE_LIBS@ @XPMLIB@ -lXext -lX11 @X_EXTRA_LIBS@ 
 
 SUBDIRS = asm builtin engine fft include io lib parse ${PLOTDIR}
 
@@ -175,20 +175,20 @@ all: all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$@ $(SHELL) ./config.status
 
 $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
-$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
-$(ACLOCAL_M4):  configure.in acinclude.m4
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 AR = ar
@@ -538,35 +538,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: