rpl/src/Makefile.am - diff

Return to Makefile.am CVS log

Up to [local] / rpl / src

Diff for /rpl/src/Makefile.am between versions 1.61 and 1.62

version 1.61, 2011/09/14 14:34:27	version 1.62, 2011/09/16 14:42:03
Line 1	Line 1
	include $(top_builddir)/tools/openmotif.lib

ldadd_libncurses = $(top_builddir)/tools/@NCURSES@/lib/libncurses.a	ldadd_libncurses = $(top_builddir)/tools/@NCURSES@/lib/libncurses.a
include_libncurses = -I$(top_builddir)/tools/@NCURSES@/include \	include_libncurses = -I$(top_builddir)/tools/@NCURSES@/include \
-I$(top_srcdir)/tools/@NCURSES@/include	-I$(top_srcdir)/tools/@NCURSES@/include
Line 27 ldadd_librplcas = @LIBRPLCAS@	Line 29 ldadd_librplcas = @LIBRPLCAS@
include_librplcas = -I$(top_builddir)/rplcas/include/giac \	include_librplcas = -I$(top_builddir)/rplcas/include/giac \
-I$(top_builddir)/rplcas/include	-I$(top_builddir)/rplcas/include

	ldadd_libmotif = @LIBMOTIF@
	include_libmotif = @INCMOTIF@

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); \	$(AWK) '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \
printf("%s\n", v);}')\"" \	printf("%s\n", v);}')\"" \
Line 398 rpl.inc:	Line 403 rpl.inc:
$(ldadd_libsqlite) \	$(ldadd_libsqlite) \
$(ldadd_librplcas) \	$(ldadd_librplcas) \
$(ldadd_libsigsegv) \	$(ldadd_libsigsegv) \
	$(ldadd_libmotif) \
>> $@	>> $@

EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \	EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \
Line 435 INCLUDES = -I$(srcdir) -I$(top_builddir)	Line 441 INCLUDES = -I$(srcdir) -I$(top_builddir)
$(include_libreadline) $(include_libncurses) $(include_libgsl) \	$(include_libreadline) $(include_libncurses) $(include_libgsl) \
$(include_libiconv) $(include_libcrypto) $(include_libsqlite) \	$(include_libiconv) $(include_libcrypto) $(include_libsqlite) \
$(include_librplcas) $(include_libsigsegv) \	$(include_librplcas) $(include_libsigsegv) \
	$(include_libmotif) \
@includeX@ @libMySQLinc@ @libPgSQLinc@	@includeX@ @libMySQLinc@ @libPgSQLinc@
DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" \	DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" \
-Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG@ \	-Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG@ \
Line 450 rpl_LDADD = -lgfortran \	Line 457 rpl_LDADD = -lgfortran \
$(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \	$(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \
$(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \	$(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \
$(ldadd_libsqlite) $(ldadd_libsigsegv) \	$(ldadd_libsqlite) $(ldadd_libsigsegv) \
	$(ldadd_libmotif) $(LD_MOTIF_LIBS) $(LD_MOTIF_X_XMU) \
$(ldadd_libgsl) $(ldadd_librplcas) @libX@ @libMySQLlib@ @libPgSQLlib@	$(ldadd_libgsl) $(ldadd_librplcas) @libX@ @libMySQLlib@ @libPgSQLlib@

always: $(top_builddir)/src/rpl-conv.c	always: $(top_builddir)/src/rpl-conv.c
Line 476 librpl: install-libLIBRARIES	Line 484 librpl: install-libLIBRARIES
$(top_builddir)/lapack/blas/libblas.a \	$(top_builddir)/lapack/blas/libblas.a \
$(ldadd_libncurses) $(ldadd_libgsl) $(ldadd_libiconv) \	$(ldadd_libncurses) $(ldadd_libgsl) $(ldadd_libiconv) \
$(ldadd_libcrypto) $(ldadd_libssl) $(ldadd_libsqlite) \	$(ldadd_libcrypto) $(ldadd_libssl) $(ldadd_libsqlite) \
$(ldadd_librplcas) $(ldadd_libsigsegv); \	$(ldadd_librplcas) $(ldadd_libsigsegv) $(ldadd_libmotif); \
do \	do \
cp -f $$i $(top_builddir)/librpl; \	cp -f $$i $(top_builddir)/librpl; \
done	done

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.61
changed lines
	Added in v.1.62