--- rpl/src/Makefile.am	2010/08/06 15:26:42	1.29
+++ rpl/src/Makefile.am	2010/12/08 20:58:16	1.45
@@ -27,9 +27,6 @@ date = -Dd_date_rpl="\"$(shell LC_ALL=fr
 		$(AWK) '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \
 		printf("%s\n", v);}')\""
 
-hash.h:
-	$(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
-			$(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) > $@
 
 hash = -Drplpp_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
 		$(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \
@@ -43,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) \
@@ -190,6 +191,7 @@ SRCC=\
 	rplcore.c\
 	semaphores.c\
 	sequenceur.c\
+	siginfo.c\
 	simplification.c\
 	sommations.c\
 	sql.c\
@@ -233,9 +235,7 @@ 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@
+LIB=-lz
 
 bin_PROGRAMS = rpl
 lib_LIBRARIES = librpl.a
@@ -359,12 +359,13 @@ 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) >> $@
-	echo EXTOBJECTS= @MALLOC@ @EXT_SQL@ \
+	echo EXTOBJECTS= @EXT_SQL@ \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(ldadd_libhistory) \
@@ -392,7 +393,7 @@ nodist_rpl_SOURCES = \
 		$(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
 		$(SRCXPM) $(SRCINCc)
 rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@
-rpl_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \
+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
@@ -400,7 +401,7 @@ rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-
 nodist_librpl_a_SOURCES = \
 		$(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_LIBc) \
 		$(SRCXPM) $(SRCINCc)
-librpl_a_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \
+librpl_a_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -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
@@ -412,14 +413,14 @@ INCLUDES = -I$(srcdir) -I$(top_builddir)
 		$(include_libreadline) $(include_libncurses) $(include_libgsl) \
 		$(include_libiconv) $(include_libcrypto) $(include_libsqlite)\
 		@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_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 \
@@ -429,7 +430,7 @@ rpl_LDADD = \
 		$(ldadd_libgsl) @libX@ @libMySQLlib@ @libPgSQLlib@
 
 always: $(top_builddir)/src/rpl-conv.c
-	touch $(top_builddir)/src/rpl.conv.c; \
+	touch $(top_builddir)/src/rpl-conv.c; \
 	if [ x$(shell which ctags) != x ]; then \
    		(cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) \
 				$(INIT_LIB) $(INIT_EXE) 2>&1 /dev/null); \
@@ -442,21 +443,57 @@ all-local: always
 install-exec-local: librpl
 
 librpl: install-libLIBRARIES
-	if [ ! -d $(top_builddir)/librpl ]; then mkdir -p $(top_builddir)/librpl; fi
-	\rm -rf $(top_builddir)/librpl/*
+	if [ -d $(top_builddir)/librpl ]; then \
+		rm -rf $(top_builddir)/librpl; \
+	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); \
 	do \
-		\cp -f $$i $(top_builddir)/librpl; \
+		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
+	(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 `find . -name "*.$(OBJEXT)"`; \
+				do \
+					k=`echo $$i | wc -c`; \
+					j=`expr $$j + $$k + 1`; \
+					if test $$j -le 5000; then \
+						L="$$L $$i"; \
+					else \
+						break; \
+					fi; \
+				done; \
+				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 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
+