--- rpl/src/Makefile.am 2010/03/07 17:03:29 1.9 +++ rpl/src/Makefile.am 2010/03/17 14:14:36 1.10 @@ -14,10 +14,11 @@ ldadd_libiconv = $(top_builddir)/tools/@ include_libiconv = -I$(top_builddir)/tools/@ICONV@/include ldadd_libcrypto = $(top_builddir)/tools/@OPENSSL@/libcrypto.a +ldadd_libssl = $(top_builddir)/tools/@OPENSSL@/libssl.a include_libcrypto = -I$(top_builddir)/tools/@OPENSSL@/include ldadd_libsqlite = $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a -include_libsqlite = -I$(top_builddir)/tools/@SQLITE@/include +include_libsqlite = -I$(top_builddir)/tools/@SQLITE@ date := -Dd_date_rpl="\"$(shell LC_ALL=fr_FR date +'%A %x, %X %Z' | \ awk '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \ @@ -341,24 +342,48 @@ licences: librplprototypes.h: rpl.h conversion.awk awk -f $(srcdir)/conversion.awk $(srcdir)/rpl.h > \ $(top_builddir)/src/librplprototypes.h + generateurs.c: generateurs_aleatoires.awk awk -f $(srcdir)/generateurs_aleatoires.awk \ $(srcdir)/../tools/@GSL@/rng/gsl_rng.h > \ $(top_builddir)/src/generateurs.c +rpl.inc: + echo BUILDPATH=$(shell pwd)/.. > $@ + 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= \ + addlib $(top_builddir)/lapack/lapack/liblapack.a+ \ + addlib $(top_builddir)/lapack/blas/libblas.a+ \ + addlib $(ldadd_libhistory)+ \ + addlib $(ldadd_libreadline)+ \ + addlib $(ldadd_libncurses)+ \ + addlib $(ldadd_libgsl)+ \ + addlib $(ldadd_libiconv)+ \ + addlib $(ldadd_libcrypto)+ \ + addlib $(ldadd_libssl)+ \ + addlib $(ldadd_libsqlite) \ + >> $@ + gcc $(INCLUDES) $(DEFS) $(AM_CFLAGS) $(rpl_CFLAGS) librpl.conv.c \ + -c -o rpl-librpl.conv.o + EXTRA_DIST = $(SRCC) $(SRCH) $(SRCF) $(SRCF90) $(SRCINC) \ $(INIT_EXE) $(INIT_LIB) $(SRCXPM) \ conversion.awk generateurs_aleatoires.awk BUILT_SOURCES = librplprototypes.h generateurs.c \ $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) \ - $(INIT_LIBc) $(SRCINCc) $(INIT_EXEc) + $(INIT_LIBc) $(SRCINCc) $(INIT_EXEc) \ + rpl.inc CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(SRCINCc) \ - $(INIT_LIBc) $(INIT_EXEc) librplprototypes.h + $(INIT_LIBc) $(INIT_EXEc) librplprototypes.h generateurs.c \ + rpl.inc rpl-librpl.conv.o nodist_rpl_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \ $(SRCXPM) $(SRCINCc) #rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -rdynamic -rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -export-dynamic +rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) --export-dynamic rpl_CFLAGS = $(AM_CFLAGS) -Wall -Wextra \ -Wno-pointer-sign -Wno-unused-parameter @@ -372,7 +397,7 @@ librpl_a_CFLAGS = $(AM_CFLAGS) -DLIBRPL librpl_a_FFLAGS = $(AM_FFLAGS) -ff2c librpl_a_FCFLAGS = $(AM_FCLAGS) -fno-second-underscore -include_HEADERS = rplexternals.h rpltypes.h rpl.h librpl.h +include_HEADERS = rplexternals.h rpltypes.h rpl.h librpl.h rpl.inc INCLUDES = -I$(srcdir) -I$(top_builddir) \ $(include_libreadline) $(include_libncurses) $(include_libgsl) \ @@ -388,7 +413,8 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\ rpl_LDADD = $(top_builddir)/lapack/lapack/liblapack.a \ $(top_builddir)/lapack/blas/libblas.a \ $(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \ - $(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libsqlite) \ + $(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \ + $(ldadd_libsqlite) \ $(ldadd_libgsl) @libX@ @libMySQLlib@ @libPgSQLlib@ always: $(top_builddir)/src/rpl.conv.c @@ -396,7 +422,7 @@ always: $(top_builddir)/src/rpl.conv.c (cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) $(SRCH) $(SRCINC) \ $(INIT_LIB) $(INIT_EXE) 2>&1 /dev/null); -.PHONY: always librpl licences +.PHONY: always librpl licences rpl.inc all-local: always @@ -413,6 +439,7 @@ librpl: install-libLIBRARIES addlib $(ldadd_libgsl)+ \ addlib $(ldadd_libiconv)+ \ addlib $(ldadd_libcrypto)+ \ + addlib $(ldadd_libssl)+ \ addlib $(ldadd_libsqlite)+ \ save+ \ end \