--- rpl/src/Makefile.am	2010/09/02 07:51:47	1.39
+++ rpl/src/Makefile.am	2011/06/23 13:03:39	1.51
@@ -40,6 +40,10 @@ hash = -Drplpp_md5="\"$(shell $(top_buil
 		$(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \
 		-Drpliconv_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
 		$(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \
+		-Drplawk_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
+		$(top_builddir)/rplawk/rplawk$(EXEEXT))\"" \
+		-Drplawk_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
+		$(top_builddir)/rplawk/rplawk$(EXEEXT))\"" \
 		-Drplconvert_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
 		$(top_builddir)/tools/@UNITS@/units$(EXEEXT))\"" \
 		-Drplconvert_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
@@ -70,6 +74,7 @@ SRCC=\
 	fonctions_trigonometriques.c\
 	formateur.c\
 	formateur_fichiers.c\
+	formateur_flux.c\
 	fusible.c\
 	generateurs_aleatoires.c\
 	gestion_fichiers.c\
@@ -195,6 +200,9 @@ SRCC=\
 	transliteration.c\
 	types.c
 
+SRCCPP=\
+	interface_cas.cpp
+
 SRCH=\
 	completion.h\
 	convert.h\
@@ -231,8 +239,6 @@ INIT_EXE=init.c
 
 INIT_LIB=librpl.c
 
-# @MALLOC@ doit être la première bibliothèque pour éviter que la libgfortran
-# utilise un allocateur différent.
 LIB=-lz @MALLOC@
 
 bin_PROGRAMS = rpl
@@ -240,6 +246,7 @@ lib_LIBRARIES = librpl.a
 
 SRCCc=$(SRCC:.c=-conv.c)
 SRCHc=$(SRCH:.h=-conv.h)
+SRCCPPc=$(SRCCPP:.cpp=-conv.cpp)
 SRCFc=$(SRCF:.f=-conv.f)
 SRCF90c=$(SRCF90:.F90=-conv.F90)
 SRCINCc=$(SRCINC:.inc=-conv.inc)
@@ -253,6 +260,13 @@ INIT_EXEc=$(INIT_EXE:.c=-conv.c)
 			$(AWK) -F= '{print $$2;}'` \
 			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
 
+%-conv.cpp: %.cpp
+	$(top_builddir)/rpliconv/rpliconv \
+			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
+			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
+			$(AWK) -F= '{print $$2;}'` \
+			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
+
 %-conv.h: %.h
 	$(top_builddir)/rpliconv/rpliconv \
 			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
@@ -300,7 +314,7 @@ licences:
 	echo "#endif" >> $(srcdir)/licence.h
 	echo >> $(srcdir)/licence.h
 	echo "// vim: ts=4" >> $(srcdir)/licence.h
-	for i in $(SRCC) $(SRCH) $(INIT_EXE) $(INIT_LIB); \
+	for i in $(SRCC) $(SRCCPP) $(SRCH) $(INIT_EXE) $(INIT_LIB); \
 	do \
 		cat $(srcdir)/../COPYING > $(srcdir)/tmp; \
 		echo >> $(srcdir)/tmp; \
@@ -357,12 +371,13 @@ generateurs.c: generateurs_aleatoires.aw
 
 rpl.inc:
 	echo BUILDPATH=$(top_builddir)/.. > $@
-	echo COMPILE=$(DEFS) >> $@
+	echo COMPILE=$(DEFS) | sed -e '1,$$s/"/\\"/g' | \
+		sed -e '1,$$s/=\\"/="\\"/g' | sed -e '1,$$s/\\" /\\"" /g' >> $@
 	echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ -lz >> $@
 	echo OBJECTS=$(SRCCc:.c=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \
 			$(SRCF90c:.F90=.$(OBJEXT)) \
 			librpl-conv.$(OBJEXT) >> $@
-	echo EXTOBJECTS= @MALLOC@ @EXT_SQL@ \
+	echo EXTOBJECTS= @EXT_SQL@ \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(ldadd_libhistory) \
@@ -375,19 +390,19 @@ rpl.inc:
 		$(ldadd_libsqlite) \
 		>> $@
 
-EXTRA_DIST = $(SRCC) $(SRCH) $(SRCF) $(SRCF90) $(SRCINC) \
+EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \
 		$(INIT_EXE) $(INIT_LIB) $(SRCXPM) \
 		conversion.awk generateurs_aleatoires.awk
 BUILT_SOURCES = librplprototypes.h generateurs.c \
-		$(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) \
+		$(SRCCc) $(SRCHc) $(SRCCPPc) $(SRCFc) $(SRCF90c) \
 		$(INIT_LIBc) $(SRCINCc) $(INIT_EXEc) \
 		rpl.inc
-CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(SRCINCc) \
+CLEANFILES= $(SRCCc) $(SRCHc) $(SRCCPPc) $(SRCFc) $(SRCF90c) $(SRCINCc) \
 		$(INIT_LIBc) $(INIT_EXEc) librplprototypes.h generateurs.c \
 		rpl.inc rpl-librpl-conv.$(OBJEXT)
 
 nodist_rpl_SOURCES = \
-		$(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
+		$(SRCCc) $(SRCHc) $(SRCCPPc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
 		$(SRCXPM) $(SRCINCc)
 rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@
 rpl_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \
@@ -396,7 +411,7 @@ 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) \
+		$(SRCCc) $(SRCHc) $(SRCFc) $(SRCCPPc) $(SRCF90c) $(INIT_LIBc) \
 		$(SRCXPM) $(SRCINCc)
 librpl_a_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \
 		-Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@
@@ -414,10 +429,10 @@ 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@ @SEMAPHORES_SYSV@ @IPCS_SYSV@ @SEMUN@ @IPV6@ \
+		@SEMAPHORES_NOMMES@ @IPCS_SYSV@ @SEMUN@ @IPV6@ \
 		@EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
 		-Dd_locale=\"@FINAL_ENCODING@\" \
-		-D@OS@
+		-D@OS@ @BSH_PATH@
 rpl_LDADD = \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
@@ -427,7 +442,7 @@ rpl_LDADD = \
 		$(ldadd_libgsl) @libX@ @libMySQLlib@ @libPgSQLlib@
 
 always: $(top_builddir)/src/rpl-conv.c
-	touch $(top_builddir)/src/rpl.conv.c; \
+	touch $<; \
 	if [ x$(shell which ctags) != x ]; then \
    		(cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) \
 				$(INIT_LIB) $(INIT_EXE) 2>&1 /dev/null); \
@@ -445,7 +460,6 @@ librpl: install-libLIBRARIES
 	fi
 	mkdir -p $(top_builddir)/librpl; \
 	for i in $(top_builddir)/src/librpl.a \
-			@MALLOC@ \
 			$(ldadd_libhistory) $(ldadd_libreadline) \
 			$(top_builddir)/lapack/lapack/liblapack.a \
 			$(top_builddir)/lapack/blas/libblas.a \