--- rpl/src/Makefile.am	2010/08/13 21:00:36	1.34
+++ rpl/src/Makefile.am	2011/09/08 15:24:24	1.59
@@ -20,6 +20,10 @@ include_libcrypto = -I$(top_builddir)/to
 ldadd_libsqlite = $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a
 include_libsqlite = -I$(top_srcdir)/tools/@SQLITE@
 
+ldadd_librplcas = @LIBRPLCAS@
+include_librplcas = -I$(top_builddir)/rplcas/include/giac \
+		-I$(top_builddir)/rplcas/include
+
 date = -Dd_date_rpl="\"$(shell LC_ALL=fr_FR date +'%A %x, %X %Z' | \
 		$(AWK) '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \
 		printf("%s\n", v);}')\"" \
@@ -40,6 +44,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 +78,7 @@ SRCC=\
 	fonctions_trigonometriques.c\
 	formateur.c\
 	formateur_fichiers.c\
+	formateur_flux.c\
 	fusible.c\
 	generateurs_aleatoires.c\
 	gestion_fichiers.c\
@@ -130,6 +139,7 @@ SRCC=\
 	instructions_l3.c\
 	instructions_l4.c\
 	instructions_l5.c\
+	instructions_l6.c\
 	instructions_m1.c\
 	instructions_m2.c\
 	instructions_m3.c\
@@ -163,6 +173,7 @@ SRCC=\
 	instructions_s8.c\
 	instructions_s9.c\
 	instructions_s10.c\
+	instructions_s11.c\
 	instructions_t1.c\
 	instructions_t2.c\
 	instructions_t3.c\
@@ -187,6 +198,7 @@ SRCC=\
 	rplcore.c\
 	semaphores.c\
 	sequenceur.c\
+	siginfo.c\
 	simplification.c\
 	sommations.c\
 	sql.c\
@@ -194,6 +206,9 @@ SRCC=\
 	transliteration.c\
 	types.c
 
+SRCCPP=\
+	interface_cas.cpp
+
 SRCH=\
 	completion.h\
 	convert.h\
@@ -230,8 +245,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
@@ -239,6 +252,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)
@@ -252,6 +266,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 \
@@ -299,7 +320,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; \
@@ -356,12 +377,13 @@ generateurs.c: generateurs_aleatoires.aw
 
 rpl.inc:
 	echo BUILDPATH=$(top_builddir)/.. > $@
-	echo COMPILE=$(DEFS) >> $@
-	echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ $(LIBS) >> $@
+	echo COMPILE="$(DEFS) @ABI@" | 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) \
@@ -372,30 +394,31 @@ rpl.inc:
 		$(ldadd_libcrypto) \
 		$(ldadd_libssl) \
 		$(ldadd_libsqlite) \
+		$(ldadd_librplcas) \
 		>> $@
 
-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_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@ @ELF@
 rpl_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -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) \
+		$(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@
@@ -407,26 +430,27 @@ include_HEADERS = rplexternals.h rpltype
 
 INCLUDES = -I$(srcdir) -I$(top_builddir) \
 		$(include_libreadline) $(include_libncurses) $(include_libgsl) \
-		$(include_libiconv) $(include_libcrypto) $(include_libsqlite)\
+		$(include_libiconv) $(include_libcrypto) $(include_libsqlite) \
+		$(include_librplcas) \
 		@includeX@ @libMySQLinc@ @libPgSQLinc@
-DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" \
+DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" @BROKEN_SIGINFO@ \
 		-Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG@ \
 		@MOTIF_SUPPORT@ @POSTSCRIPT_SUPPORT@ @GNUPLOT_SUPPORT@ \
 		@VIM_SUPPORT@ @MYSQL_SUPPORT@ @POSTGRESQL_SUPPORT@ \
-		@SEMAPHORES_NOMMES@ @SEMAPHORES_SYSV@ @SEMUN@ @IPV6@ \
+		@SEMAPHORES_NOMMES@ @IPCS_SYSV@ @SEMUN@ @IPV6@ \
 		@EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
 		-Dd_locale=\"@FINAL_ENCODING@\" \
-		-D@OS@
-rpl_LDADD = \
+		-D@OS@ @BSH_PATH@ @RPLCAS@ -DHOST=\"@HOST@\"
+rpl_LDADD = -lgfortran \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \
 		$(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \
 		$(ldadd_libsqlite) \
-		$(ldadd_libgsl) @libX@ @libMySQLlib@ @libPgSQLlib@
+		$(ldadd_libgsl) $(ldadd_librplcas) @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); \
@@ -444,23 +468,33 @@ 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 \
 			$(ldadd_libncurses) $(ldadd_libgsl) $(ldadd_libiconv) \
-			$(ldadd_libcrypto) $(ldadd_libssl) $(ldadd_libsqlite); \
+			$(ldadd_libcrypto) $(ldadd_libssl) $(ldadd_libsqlite) \
+			$(ldadd_librplcas); \
 	do \
 		cp -f $$i $(top_builddir)/librpl; \
 	done
-	(cd $(top_builddir)/librpl && \
-			for i in *.a; do ar x $$i && rm -f $$i; done; \
-			L="start"; \
+	(cd $(top_builddir)/librpl && n=0 && \
 			echo Building standalone librpl.a; \
+			for i in *.a; \
+				do echo Extracting $$i; ar x $$i; \
+				for j in `ar t $$i`; \
+				do cp -f $$j $$n-$$j; \
+					rm -f $$j; \
+				done; \
+				n=`expr $$n + 1`; \
+				rm -f $$i; \
+			done; \
+			L="start"; \
 			while test -n "$$L"; \
 			do \
+				echo -n "Remaining files "; \
+				find . -name "*.$(OBJEXT)" | wc -l; \
 				L=""; j=0; \
-				for i in `ls *.$(OBJEXT) 2> /dev/null`; \
+				for i in `find . -name "*.$(OBJEXT)"`; \
 				do \
 					k=`echo $$i | wc -c`; \
 					j=`expr $$j + $$k + 1`; \
@@ -470,12 +504,17 @@ librpl: install-libLIBRARIES
 						break; \
 					fi; \
 				done; \
-				ar cru librpl.a $$L; \
-				rm -f $$L; \
-				echo -n "Remaining files "; \
-				ls *.$(OBJEXT) 2> /dev/null | wc -l; \
+				if test -n "$$L"; then \
+					echo -n "Adding files to librpl.a archive... "; \
+					ar cru librpl.a $$L; \
+					rm -f $$L; \
+					echo "done"; \
+				fi; \
 			done; \
-			echo Done; \
-			ar s librpl.a); \
-	mv -f $(top_builddir)/librpl/librpl.a $(top_builddir)/src/librpl.a
+			echo Archive created; \
+			ar s librpl.a; \
+			if [ @OS@ != OS2 ]; then \
+				echo Stripping librpl.a && strip -d librpl.a; \
+			fi;); \
+	$(INSTALL_DATA) $(top_builddir)/librpl/librpl.a $(DESTDIR)$(libdir)/librpl.a