--- rpl/src/Makefile.am	2010/05/10 08:30:31	1.22
+++ rpl/src/Makefile.am	2010/08/15 14:46:24	1.35
@@ -20,28 +20,29 @@ include_libcrypto = -I$(top_builddir)/to
 ldadd_libsqlite = $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a
 include_libsqlite = -I$(top_srcdir)/tools/@SQLITE@
 
-date := -Dd_date_rpl="\"$(shell LC_ALL=fr_FR date +'%A %x, %X %Z' | \
+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);}')\"" \
 		-Dd_date_en_rpl="\"$(shell LC_ALL=C date +'%A %x, %X %Z' | \
 		$(AWK) '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \
 		printf("%s\n", v);}')\""
 
-hash := -Drplpp_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \
+
+hash = -Drplpp_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
 		$(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \
-		-Drplpp_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum \
+		-Drplpp_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
 		$(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \
-		-Drplfile_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \
+		-Drplfile_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
 		$(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT))\"" \
-		-Drplfile_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum \
+		-Drplfile_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
 		$(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT))\"" \
-		-Drpliconv_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \
+		-Drpliconv_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
 		$(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \
-		-Drpliconv_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum \
+		-Drpliconv_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
 		$(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \
-		-Drplconvert_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \
+		-Drplconvert_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
 		$(top_builddir)/tools/@UNITS@/units$(EXEEXT))\"" \
-		-Drplconvert_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum \
+		-Drplconvert_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
 		$(top_builddir)/tools/@UNITS@/units$(EXEEXT))\""
 
 SRCC=\
@@ -83,6 +84,7 @@ SRCC=\
 	gestion_variables.c\
 	gestion_variables_statiques.c\
 	gestion_variables_partagees.c\
+	getaddrinfo.c\
 	indicateurs.c\
 	instructions_a1.c\
 	instructions_a2.c\
@@ -197,6 +199,7 @@ SRCH=\
 	convert.h\
 	copyright.h\
 	garanties.h\
+	getaddrinfo.h\
 	gnuplot.h\
 	librpl.h\
 	licence.h\
@@ -227,48 +230,50 @@ INIT_EXE=init.c
 
 INIT_LIB=librpl.c
 
-LIB=-lz
+# @MALLOC@ doit être la première bibliothèque pour éviter que la libgfortran
+# utilise un allocateur différent.
+LIB=-lz @MALLOC@
 
 bin_PROGRAMS = rpl
 lib_LIBRARIES = librpl.a
 
-SRCCc=$(SRCC:.c=.conv.c)
-SRCHc=$(SRCH:.h=.conv.h)
-SRCFc=$(SRCF:.f=.conv.f)
-SRCF90c=$(SRCF90:.F90=.conv.F90)
-SRCINCc=$(SRCINC:.inc=.conv.inc)
-INIT_LIBc=$(INIT_LIB:.c=.conv.c)
-INIT_EXEc=$(INIT_EXE:.c=.conv.c)
+SRCCc=$(SRCC:.c=-conv.c)
+SRCHc=$(SRCH:.h=-conv.h)
+SRCFc=$(SRCF:.f=-conv.f)
+SRCF90c=$(SRCF90:.F90=-conv.F90)
+SRCINCc=$(SRCINC:.inc=-conv.inc)
+INIT_LIBc=$(INIT_LIB:.c=-conv.c)
+INIT_EXEc=$(INIT_EXE:.c=-conv.c)
 
-%.conv.c: %.c
+%-conv.c: %.c
 	$(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
+%-conv.h: %.h
 	$(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.f: %.f
+%-conv.f: %.f
 	$(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.F90: %.F90
+%-conv.F90: %.F90
 	$(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.inc: %.inc
+%-conv.inc: %.inc
 	$(top_builddir)/rpliconv/rpliconv \
 			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
 			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
@@ -350,13 +355,13 @@ generateurs.c: generateurs_aleatoires.aw
 			$(top_builddir)/src/generateurs.c
 
 rpl.inc:
-	echo BUILDPATH=$(shell pwd)/.. > $@
+	echo BUILDPATH=$(top_builddir)/.. > $@
 	echo COMPILE=$(DEFS) >> $@
 	echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ $(LIBS) >> $@
-	echo OBJECTS=$(SRCCc:.c=.o) $(SRCFc:.f=.o) $(SRCF90c:.F90=.o) \
-			librpl.conv.o >> $@
-	echo EXTOBJECTS= \
-		$(top_builddir)/ptmalloc3/libptmalloc3.a \
+	echo OBJECTS=$(SRCCc:.c=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \
+			$(SRCF90c:.F90=.$(OBJEXT)) \
+			librpl-conv.$(OBJEXT) >> $@
+	echo EXTOBJECTS= @MALLOC@ @EXT_SQL@ \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(ldadd_libhistory) \
@@ -378,19 +383,21 @@ BUILT_SOURCES = librplprototypes.h gener
 		rpl.inc
 CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(SRCINCc) \
 		$(INIT_LIBc) $(INIT_EXEc) librplprototypes.h generateurs.c \
-		rpl.inc rpl-librpl.conv.o
+		rpl.inc rpl-librpl-conv.$(OBJEXT)
 
-nodist_rpl_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
+nodist_rpl_SOURCES = \
+		$(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
 		$(SRCXPM) $(SRCINCc)
-rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -Wl,@EXPORT_DYNAMIC@
-rpl_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \
+rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@
+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) \
-		 $(SRCXPM) $(SRCINCc)
-librpl_a_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \
+nodist_librpl_a_SOURCES = \
+		$(SRCCc) $(SRCHc) $(SRCFc) $(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@
 librpl_a_FFLAGS = $(AM_FFLAGS) -ff2c
 librpl_a_FCFLAGS = $(AM_FCLAGS) -fno-second-underscore
@@ -402,15 +409,15 @@ 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@ @SEMAPHORES_SYSV@ @SEMUN@ @IPV6@ \
 		@EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
 		-Dd_locale=\"@FINAL_ENCODING@\" \
 		-D@OS@
-rpl_LDADD = $(top_builddir)/ptmalloc3/libptmalloc3.a \
+rpl_LDADD = \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \
@@ -418,7 +425,7 @@ rpl_LDADD = $(top_builddir)/ptmalloc3/li
 		$(ldadd_libsqlite) \
 		$(ldadd_libgsl) @libX@ @libMySQLlib@ @libPgSQLlib@
 
-always: $(top_builddir)/src/rpl.conv.c
+always: $(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) \
@@ -432,21 +439,46 @@ 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 \
-			$(top_builddir)/ptmalloc3/libptmalloc3.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
+			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
+