--- rpl/src/Makefile.am	2010/04/21 13:45:43	1.17
+++ rpl/src/Makefile.am	2010/05/10 08:30:31	1.22
@@ -132,6 +132,7 @@ SRCC=\
 	instructions_m2.c\
 	instructions_m3.c\
 	instructions_m4.c\
+	instructions_m5.c\
 	instructions_n1.c\
 	instructions_n2.c\
 	instructions_o1.c\
@@ -226,7 +227,7 @@ INIT_EXE=init.c
 
 INIT_LIB=librpl.c
 
-LIB=-lz @LIBMTMALLOC@
+LIB=-lz
 
 bin_PROGRAMS = rpl
 lib_LIBRARIES = librpl.a
@@ -355,6 +356,7 @@ rpl.inc:
 	echo OBJECTS=$(SRCCc:.c=.o) $(SRCFc:.f=.o) $(SRCF90c:.F90=.o) \
 			librpl.conv.o >> $@
 	echo EXTOBJECTS= \
+		$(top_builddir)/ptmalloc3/libptmalloc3.a \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(ldadd_libhistory) \
@@ -366,8 +368,6 @@ rpl.inc:
 		$(ldadd_libssl) \
 		$(ldadd_libsqlite) \
 		>> $@
-	gcc $(INCLUDES) $(DEFS) $(AM_CFLAGS) $(rpl_CFLAGS) librpl.conv.c \
-			-c -o rpl-librpl.conv.o
 
 EXTRA_DIST = $(SRCC) $(SRCH) $(SRCF) $(SRCF90) $(SRCINC) \
 		$(INIT_EXE) $(INIT_LIB) $(SRCXPM) \
@@ -383,20 +383,20 @@ CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $
 nodist_rpl_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
 		$(SRCXPM) $(SRCINCc)
 rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -Wl,@EXPORT_DYNAMIC@
-
-rpl_CFLAGS = $(AM_CFLAGS) -ULIBRPL -Wall -Wextra \
+rpl_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \
 		 -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@
 rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c
 rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-underscore -fno-f2c
 
 nodist_librpl_a_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_LIBc) \
 		 $(SRCXPM) $(SRCINCc)
-librpl_a_CFLAGS = $(AM_CFLAGS) -DLIBRPL -Wall -Wextra \
+librpl_a_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \
 		-Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@
 librpl_a_FFLAGS = $(AM_FFLAGS) -ff2c
 librpl_a_FCFLAGS = $(AM_FCLAGS) -fno-second-underscore
 
-include_HEADERS = rplexternals.h rpltypes.h rpl.h librpl.h rpl.inc
+include_HEADERS = rplexternals.h rpltypes.h rpl.h librpl.h rpl.inc \
+		librplprototypes.h
 
 INCLUDES = -I$(srcdir) -I$(top_builddir) \
 		$(include_libreadline) $(include_libncurses) $(include_libgsl) \
@@ -410,7 +410,8 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
 		@EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
 		-Dd_locale=\"@FINAL_ENCODING@\" \
 		-D@OS@
-rpl_LDADD = $(top_builddir)/lapack/lapack/liblapack.a \
+rpl_LDADD = $(top_builddir)/ptmalloc3/libptmalloc3.a \
+		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \
 		$(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \
@@ -434,6 +435,7 @@ librpl: install-libLIBRARIES
 	if [ ! -d $(top_builddir)/librpl ]; then mkdir -p $(top_builddir)/librpl; fi
 	\rm -rf $(top_builddir)/librpl/*
 	for i in $(top_builddir)/src/librpl.a \
+			$(top_builddir)/ptmalloc3/libptmalloc3.a \
 			$(ldadd_libhistory) $(ldadd_libreadline) \
 			$(top_builddir)/lapack/lapack/liblapack.a \
 			$(top_builddir)/lapack/blas/libblas.a \