--- rpl/src/Makefile.am	2010/08/22 16:38:36	1.36
+++ rpl/src/Makefile.am	2010/09/08 08:37:34	1.43
@@ -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) \
@@ -187,6 +191,7 @@ SRCC=\
 	rplcore.c\
 	semaphores.c\
 	sequenceur.c\
+	siginfo.c\
 	simplification.c\
 	sommations.c\
 	sql.c\
@@ -356,8 +361,9 @@ generateurs.c: generateurs_aleatoires.aw
 
 rpl.inc:
 	echo BUILDPATH=$(top_builddir)/.. > $@
-	echo COMPILE=$(DEFS) >> $@
-	echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ $(LIBS) >> $@
+	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) >> $@
@@ -413,10 +419,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 \
@@ -453,14 +459,24 @@ librpl: install-libLIBRARIES
 	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,15 +486,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; \
+			echo Archive created; \
 			ar s librpl.a; \
 			if [ @OS@ != OS2 ]; then \
 				echo Stripping librpl.a && strip -d librpl.a; \
 			fi;); \
-	mv -f $(top_builddir)/librpl/librpl.a $(top_builddir)/src/librpl.a
+	$(INSTALL_DATA) $(top_builddir)/librpl/librpl.a $(DESTDIR)$(libdir)/librpl.a