--- rpl/src/Makefile.am	2010/08/10 18:02:43	1.32
+++ rpl/src/Makefile.am	2010/08/22 16:38:36	1.36
@@ -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))\"" \
@@ -412,11 +409,11 @@ 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_SYSV@ @SEMUN@ \
+		@SEMAPHORES_NOMMES@ @SEMAPHORES_SYSV@ @IPCS_SYSV@ @SEMUN@ @IPV6@ \
 		@EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
 		-Dd_locale=\"@FINAL_ENCODING@\" \
 		-D@OS@
@@ -456,15 +453,32 @@ librpl: install-libLIBRARIES
 	do \
 		cp -f $$i $(top_builddir)/librpl; \
 	done
-	if [ @OS@ = OS2 ]; then \
-		(cd $(top_builddir)/librpl && \
-				for i in *.a; do ar x $$i && rm -f $$i; done && \
-				for i in *.$(OBJEXT); do ar cru librpl.a $$i; done && \
-				ar s librpl.a;); \
-	else \
-		(cd $(top_builddir)/librpl && \
-				for i in *.a; do ar x $$i && rm -f $$i; done; \
-				ar crs librpl.a *.$(OBJEXT);); \
-	fi
+	(cd $(top_builddir)/librpl && \
+			for i in *.a; do ar x $$i && rm -f $$i; done; \
+			L="start"; \
+			echo Building standalone librpl.a; \
+			while test -n "$$L"; \
+			do \
+				L=""; j=0; \
+				for i in `ls *.$(OBJEXT) 2> /dev/null`; \
+				do \
+					k=`echo $$i | wc -c`; \
+					j=`expr $$j + $$k + 1`; \
+					if test $$j -le 5000; then \
+						L="$$L $$i"; \
+					else \
+						break; \
+					fi; \
+				done; \
+				ar cru librpl.a $$L; \
+				rm -f $$L; \
+				echo -n "Remaining files "; \
+				ls *.$(OBJEXT) 2> /dev/null | wc -l; \
+			done; \
+			echo Done; \
+			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