rpl/Makefile.am - diff

Return to Makefile.am CVS log

Up to [local] / rpl

Diff for /rpl/Makefile.am between versions 1.16 and 1.17

version 1.16, 2010/08/09 13:52:11	version 1.17, 2010/08/13 21:02:18
Line 17 toolsdistclean:	Line 17 toolsdistclean:
for i in @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \	for i in @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
@FILE@ @ICONV@ @SQLITE@; \	@FILE@ @ICONV@ @SQLITE@; \
do \	do \
\rm -rf $(srcdir)/tools/$$i; \	rm -rf $(srcdir)/tools/$$i; \
done;	done;

toolsclean:	toolsclean:
Line 52 $(top_builddir)/tools/@NCURSES@/lib/libn	Line 52 $(top_builddir)/tools/@NCURSES@/lib/libn
print; \	print; \
} \	} \
}' $$i > $$TMP; \	}' $$i > $$TMP; \
\mv -f $$TMP $$i; \	mv -f $$TMP $$i; \
echo -n " (fixed)"; \	echo -n " (fixed)"; \
else \	else \
echo -n " (nothing to do)"; \	echo -n " (nothing to do)"; \
\rm -f $$TMP; \	rm -f $$TMP; \
fi; \	fi; \
echo .; \	echo .; \
done;	done;
Line 70 $(top_builddir)/tools/@NCURSES@/lib/libn	Line 70 $(top_builddir)/tools/@NCURSES@/lib/libn
# printf("../lib/libpanel.a ../lib/libncurses.a\n"); } \	# printf("../lib/libpanel.a ../lib/libncurses.a\n"); } \
# ! /^TEST_ARGS/ \	# ! /^TEST_ARGS/ \
# { print; }' tools/@NCURSES@/test/Makefile > $$TMP; \	# { print; }' tools/@NCURSES@/test/Makefile > $$TMP; \
# \mv -f $$TMP $$i; \	# mv -f $$TMP $$i; \
# echo .; \	# echo .; \
# done;	# done;
if [ @OS@ = "OS2" ]; then \	if [ @OS@ = "OS2" ]; then \
Line 91 $(top_builddir)/tools/@NCURSES@/lib/libn	Line 91 $(top_builddir)/tools/@NCURSES@/lib/libn
{ printf("CXX = g++\n"); } \	{ printf("CXX = g++\n"); } \
! /^CXX[ \t]/ \	! /^CXX[ \t]/ \
{ print; }' > $$TMP; \	{ print; }' > $$TMP; \
\mv -f $$TMP $(top_builddir)/tools/@NCURSES@/c++/Makefile; \	mv -f $$TMP $(top_builddir)/tools/@NCURSES@/c++/Makefile; \
fi;	fi;
$(MAKE) -C $(top_builddir)/tools/@NCURSES@ $(AM_MAKEFLAGS)	$(MAKE) -C $(top_builddir)/tools/@NCURSES@ $(AM_MAKEFLAGS)
if [ @OS@ = "OS2" ]; then \	if [ @OS@ = "OS2" ]; then \
\cp -f $(top_builddir)/tools/@NCURSES@/lib/ncurses.a \	cp -f $(top_builddir)/tools/@NCURSES@/lib/ncurses.a \
$(top_builddir)/tools/@NCURSES@/lib/libncurses.a; \	$(top_builddir)/tools/@NCURSES@/lib/libncurses.a; \
fi	fi

Line 104 $(top_builddir)/tools/@READLINE@/libread	Line 104 $(top_builddir)/tools/@READLINE@/libread
$(MAKE) -C $(top_builddir)/tools/@READLINE@ $(AM_MAKEFLAGS)	$(MAKE) -C $(top_builddir)/tools/@READLINE@ $(AM_MAKEFLAGS)

$(top_builddir)/tools/@GSL@/.libs/libgsl.a:	$(top_builddir)/tools/@GSL@/.libs/libgsl.a:
if [ @OS@ == "OS2" ]; then \	# Quick and dirty hack pour avaliser le remplacement de ${1 + "$@"}
(cp $(top_builddir)/tools/@GSL@ && ./configure --disable-shared); \	# dans ltmain.sh et propager les modifications dans le script libtool.
	if [ @OS@ = "OS2" ]; then \
	(cd $(top_builddir)/tools/@GSL@ && configure --disable-shared;); \
fi	fi
$(MAKE) -C $(top_builddir)/tools/@GSL@ $(AM_MAKEFLAGS)	$(MAKE) -C $(top_builddir)/tools/@GSL@ $(AM_MAKEFLAGS)
if [ @OS@ == "OS2" ]; then \	if [ @OS@ = "OS2" ]; then \
\cp $(top_builddir)/tools/@GSL@/.libs/gsl.a \	cp $(top_builddir)/tools/@GSL@/.libs/gsl.a \
$(top_builddir)/tools/@GSL@/.libs/libgsl.a; \	$(top_builddir)/tools/@GSL@/.libs/libgsl.a; \
fi	fi

Line 119 $(top_builddir)/tools/@ICONV@/lib/.libs/	Line 121 $(top_builddir)/tools/@ICONV@/lib/.libs/
TMP=$$(mktemp tmp.XXXXXXXXXX); \	TMP=$$(mktemp tmp.XXXXXXXXXX); \
awk '! /^[ \t]cd po/ { print; }' \	awk '! /^[ \t]cd po/ { print; }' \
$(top_builddir)/tools/@ICONV@/Makefile > $$TMP; \	$(top_builddir)/tools/@ICONV@/Makefile > $$TMP; \
\mv -f $$TMP $(top_builddir)/tools/@ICONV@/Makefile; \	mv -f $$TMP $(top_builddir)/tools/@ICONV@/Makefile; \
$(MAKE) -C $(top_builddir)/tools/@ICONV@ $(AM_MAKEFLAGS) all; \	$(MAKE) -C $(top_builddir)/tools/@ICONV@ $(AM_MAKEFLAGS) all; \
\cp -f $(top_builddir)/tools/@ICONV@/lib/.libs/iconv.a \	cp -f $(top_builddir)/tools/@ICONV@/lib/.libs/iconv.a \
$(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a; \	$(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a; \
else \	else \
$(MAKE) -C $(top_builddir)/tools/@ICONV@ $(AM_MAKEFLAGS) all; \	$(MAKE) -C $(top_builddir)/tools/@ICONV@ $(AM_MAKEFLAGS) all; \
Line 159 $(top_builddir)/tools/@FILE@/src/rplfile	Line 161 $(top_builddir)/tools/@FILE@/src/rplfile
print; \	print; \
} \	} \
}' tools/@FILE@/src/Makefile > $$TMP; \	}' tools/@FILE@/src/Makefile > $$TMP; \
\mv -f $$TMP tools/@FILE@/src/Makefile	mv -f $$TMP tools/@FILE@/src/Makefile
$(MAKE) -C $(top_builddir)/tools/@FILE@ $(AM_MAKEFLAGS)	$(MAKE) -C $(top_builddir)/tools/@FILE@ $(AM_MAKEFLAGS)

$(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a:	$(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a:
Line 181 $(top_builddir)/tools/@OPENSSL@/libcrypt	Line 183 $(top_builddir)/tools/@OPENSSL@/libcrypt
sed -e '1,$$s/-DOPENSSL_BN_ASM_PART_WORDS/-UOPENSSL_BN_ASM_PART_ASM/g' \	sed -e '1,$$s/-DOPENSSL_BN_ASM_PART_WORDS/-UOPENSSL_BN_ASM_PART_ASM/g' \
> OS2-EMX.mak2; \	> OS2-EMX.mak2; \
$(MAKE) -j1 -f OS2-EMX.mak2 $(AM_MAKEFLAGS)); \	$(MAKE) -j1 -f OS2-EMX.mak2 $(AM_MAKEFLAGS)); \
\cp $(top_builddir)/tools/@OPENSSL@/out/ssl.a \	cp $(top_builddir)/tools/@OPENSSL@/out/ssl.a \
$(top_builddir)/tools/@OPENSSL@/libssl.a; \	$(top_builddir)/tools/@OPENSSL@/libssl.a; \
\cp $(top_builddir)/tools/@OPENSSL@/out/crypto.a \	cp $(top_builddir)/tools/@OPENSSL@/out/crypto.a \
$(top_builddir)/tools/@OPENSSL@/libcrypto.a; \	$(top_builddir)/tools/@OPENSSL@/libcrypto.a; \
else \	else \
(cd $(top_builddir)/tools/@OPENSSL@ && $(MAKE) -j1 $(AM_MAKEFLAGS)); \	(cd $(top_builddir)/tools/@OPENSSL@ && $(MAKE) -j1 $(AM_MAKEFLAGS)); \

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.16
changed lines
	Added in v.1.17