--- rpl/Attic/Makefile.in 2010/09/07 13:31:53 1.33 +++ rpl/Attic/Makefile.in 2010/09/13 11:58:42 1.36 @@ -135,6 +135,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BROKEN_SIGINFO = @BROKEN_SIGINFO@ +BSH_PATH = @BSH_PATH@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -861,19 +862,19 @@ $(top_builddir)/tools/@NCURSES@/lib/libn fi; \ echo .; \ done; -# for i in tools/@NCURSES@/test/Makefile; \ -# do \ -# echo -n Checking $$i; \ -# TMP=$$(mktemp tmp.XXXXXXXXXX); \ -# awk \ -# '/^TEST_ARGS/ \ -# { printf("TEST_ARGS = ../lib/libform.a ../lib/libmenu.a "); \ -# printf("../lib/libpanel.a ../lib/libncurses.a\n"); } \ -# ! /^TEST_ARGS/ \ -# { print; }' tools/@NCURSES@/test/Makefile > $$TMP; \ -# mv -f $$TMP $$i; \ -# echo .; \ -# done; + for i in tools/@NCURSES@/test/Makefile; \ + do \ + echo -n Checking $$i; \ + TMP=$$(mktemp tmp.XXXXXXXXXX); \ + awk \ + '/^TEST_ARGS/ \ + { printf("TEST_ARGS = ../lib/libform.a ../lib/libmenu.a "); \ + printf("../lib/libpanel.a ../lib/libncurses.a\n"); } \ + ! /^TEST_ARGS/ \ + { print; }' tools/@NCURSES@/test/Makefile > $$TMP; \ + mv -f $$TMP $$i; \ + echo .; \ + done; if [ @OS@ = "OS2" ]; then \ TMP=$$(mktemp tmp.XXXXXXXXXX); \ awk \ @@ -967,6 +968,10 @@ $(top_builddir)/tools/@FILE@/src/rplfile }' tools/@FILE@/src/Makefile > $$TMP; \ mv -f $$TMP tools/@FILE@/src/Makefile $(MAKE) -C $(top_builddir)/tools/@FILE@ $(AM_MAKEFLAGS) + $(CC) -o $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \ + $(top_builddir)/tools/@FILE@/src/*.o \ + $(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \ + cut -d= -f2) $(LDFLAGS) $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a: $(MAKE) -C $(top_builddir)/tools/@SQLITE@ $(AM_MAKEFLAGS) @@ -1042,7 +1047,6 @@ all: $(top_builddir)/tools/@NCURSES@/lib $(MAKE) -C $(top_builddir)/tools $(AM_MAKEFLAGS) $(MAKE) -C $(top_builddir)/rpltags $(AM_MAKEFLAGS) $(MAKE) -C $(top_builddir)/src $(AM_MAKEFLAGS) - if [ @OS@ = "OpenBSD" ]; then chmod 755 install-sh; fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded.