--- rpl/src/Makefile.am	2010/03/29 07:57:43	1.13
+++ rpl/src/Makefile.am	2010/05/10 08:30:31	1.22
@@ -57,7 +57,6 @@ SRCC=\
 	calcul_differentiel.c\
 	calcul_integral.c\
 	chainage.c\
-	chiffrement.c\
 	compilation.c\
 	completion.c\
 	controle.c \
@@ -133,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\
@@ -183,6 +183,7 @@ SRCC=\
 	profilage.c\
 	rpl.c\
 	rplcore.c\
+	semaphores.c\
 	sequenceur.c\
 	simplification.c\
 	sommations.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,19 +356,18 @@ rpl.inc:
 	echo OBJECTS=$(SRCCc:.c=.o) $(SRCFc:.f=.o) $(SRCF90c:.F90=.o) \
 			librpl.conv.o >> $@
 	echo EXTOBJECTS= \
-		addlib $(top_builddir)/lapack/lapack/liblapack.a+ \
-		addlib $(top_builddir)/lapack/blas/libblas.a+ \
-		addlib $(ldadd_libhistory)+ \
-		addlib $(ldadd_libreadline)+ \
-		addlib $(ldadd_libncurses)+ \
-		addlib $(ldadd_libgsl)+ \
-		addlib $(ldadd_libiconv)+ \
-		addlib $(ldadd_libcrypto)+ \
-		addlib $(ldadd_libssl)+ \
-		addlib $(ldadd_libsqlite) \
+		$(top_builddir)/ptmalloc3/libptmalloc3.a \
+		$(top_builddir)/lapack/lapack/liblapack.a \
+		$(top_builddir)/lapack/blas/libblas.a \
+		$(ldadd_libhistory) \
+		$(ldadd_libreadline) \
+		$(ldadd_libncurses) \
+		$(ldadd_libgsl) \
+		$(ldadd_libiconv) \
+		$(ldadd_libcrypto) \
+		$(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) \
@@ -382,22 +382,21 @@ CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $
 
 nodist_rpl_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
 		$(SRCXPM) $(SRCINCc)
-#rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -rdynamic
-rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -Wl,--export-dynamic
-
-rpl_CFLAGS = $(AM_CFLAGS) -Wall -Wextra \
-			 -Wno-pointer-sign -Wno-unused-parameter
+rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -Wl,@EXPORT_DYNAMIC@
+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 -Wno-pointer-sign -Wno-unused-parameter
+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) \
@@ -407,10 +406,12 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
 		-Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG@ \
 		@MOTIF_SUPPORT@ @POSTSCRIPT_SUPPORT@ @GNUPLOT_SUPPORT@ \
 		@VIM_SUPPORT@ @MYSQL_SUPPORT@ @POSTGRESQL_SUPPORT@ \
+		@SEMAPHORES_NOMMES@ \
 		@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) \
@@ -419,8 +420,10 @@ rpl_LDADD = $(top_builddir)/lapack/lapac
 
 always: $(top_builddir)/src/rpl.conv.c
 	touch $(top_builddir)/src/rpl.conv.c; \
-	(cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) $(SRCH) $(SRCINC) \
-			$(INIT_LIB) $(INIT_EXE) 2>&1 /dev/null);
+	if [ x$(shell which ctags) != x ]; then \
+   		(cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) \
+				$(INIT_LIB) $(INIT_EXE) 2>&1 /dev/null); \
+	fi;
 
 .PHONY: always librpl licences rpl.inc
 
@@ -429,19 +432,21 @@ all-local: always
 install-exec-local: librpl
 
 librpl: install-libLIBRARIES
-	echo \
-		open $(libdir)/librpl.a+ \
-		addlib $(top_builddir)/lapack/lapack/liblapack.a+ \
-		addlib $(top_builddir)/lapack/blas/libblas.a+ \
-		addlib $(ldadd_libhistory)+ \
-		addlib $(ldadd_libreadline)+ \
-		addlib $(ldadd_libncurses)+ \
-		addlib $(ldadd_libgsl)+ \
-		addlib $(ldadd_libiconv)+ \
-		addlib $(ldadd_libcrypto)+ \
-		addlib $(ldadd_libssl)+ \
-		addlib $(ldadd_libsqlite)+ \
-		save+ \
-		end \
-	| tr '+' '\n' | ar -M; \
-	$(RANLIB) $(libdir)/librpl.a
+	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 \
+			$(ldadd_libncurses) $(ldadd_libgsl) $(ldadd_libiconv) \
+			$(ldadd_libcrypto) $(ldadd_libssl) $(ldadd_libsqlite); \
+	do \
+		\cp -f $$i $(top_builddir)/librpl; \
+	done
+	(cd $(top_builddir)/librpl && \
+			for i in *.a; do ar x $$i && \rm -f $$i; done; \
+			ar cr librpl.a *)
+	\mv -f $(top_builddir)/librpl/librpl.a $(top_builddir)/src/librpl.a
+	\rm -rf $(top_builddir)/librpl
+	$(RANLIB) $(top_builddir)/src/librpl.a