--- rpl/src/Makefile.am	2010/07/31 10:34:17	1.28
+++ rpl/src/Makefile.am	2010/08/06 15:26:42	1.29
@@ -27,21 +27,25 @@ date = -Dd_date_rpl="\"$(shell LC_ALL=fr
 		$(AWK) '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \
 		printf("%s\n", v);}')\""
 
-hash = -Drplpp_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \
+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))\"" \
-		-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 +87,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 +202,7 @@ SRCH=\
 	convert.h\
 	copyright.h\
 	garanties.h\
+	getaddrinfo.h\
 	gnuplot.h\
 	librpl.h\
 	licence.h\
@@ -234,43 +240,43 @@ 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 $< | \
@@ -355,8 +361,9 @@ rpl.inc:
 	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 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 \
@@ -379,12 +386,12 @@ 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) \
 		$(SRCXPM) $(SRCINCc)
-rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -Wl,@EXPORT_DYNAMIC@
+rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@
 rpl_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \
 		 -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@
 rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c
@@ -421,7 +428,7 @@ rpl_LDADD = \
 		$(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) \