--- rpl/tools/Attic/Makefile.in	2011/09/26 15:57:36	1.64
+++ rpl/tools/Attic/Makefile.in	2012/01/18 10:17:25	1.76
@@ -44,12 +44,20 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m
 CONFIG_HEADER = $(top_builddir)/rplconfig.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ABI = @ABI@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+ARCH = @ARCH@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -69,7 +77,10 @@ CYGPATH_W = @CYGPATH_W@
 C_STANDARD = @C_STANDARD@
 DATE = @DATE@
 DATE_FR = @DATE_FR@
+DEBMYSQL = @DEBMYSQL@
+DEBPQ = @DEBPQ@
 DEBUG = @DEBUG@
+DEBVIM = @DEBVIM@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DVIPS = @DVIPS@
@@ -117,6 +128,7 @@ LIBOBJS = @LIBOBJS@
 LIBRPLCAS = @LIBRPLCAS@
 LIBS = @LIBS@
 LIBXPM = @LIBXPM@
+LIB_PREFIX = @LIB_PREFIX@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
@@ -144,14 +156,17 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 POSTGRESQL_SUPPORT = @POSTGRESQL_SUPPORT@
 POSTSCRIPT_SUPPORT = @POSTSCRIPT_SUPPORT@
 PROFILAGE = @PROFILAGE@
+PSELECT = @PSELECT@
 RANLIB = @RANLIB@
 READLINE = @READLINE@
 RPLCAS = @RPLCAS@
+RPLTOOLS = @RPLTOOLS@
 RUNPATH = @RUNPATH@
 SED = @SED@
 SEMAPHORES_NOMMES = @SEMAPHORES_NOMMES@
 SEMUN = @SEMUN@
 SET_MAKE = @SET_MAKE@
+SHARED_MEMORY = @SHARED_MEMORY@
 SHELL = @SHELL@
 SIGSEGV = @SIGSEGV@
 SQLITE = @SQLITE@
@@ -161,6 +176,8 @@ UNITS = @UNITS@
 VERSION = @VERSION@
 VIM = @VIM@
 VIM_SUPPORT = @VIM_SUPPORT@
+WHOLE_LIB1 = @WHOLE_LIB1@
+WHOLE_LIB2 = @WHOLE_LIB2@
 XMKMF = @XMKMF@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
@@ -236,17 +253,10 @@ EXTRA_DIST = @NCURSES@.tar.gz @READLINE@
 		@GPP@.tar.gz @GNUPLOT@.tar.gz @FILE@.tar.gz @ICONV@.tar.gz \
 		@FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.gz \
 		@OPENMOTIF@.tar.gz @SIGSEGV@.tar.gz @LIBXPM@.tar.gz \
-		@NCURSES@-20110409.patch.gz @NCURSES@-20110416.patch.gz \
-		@NCURSES@-20110423.patch.gz @NCURSES@-20110430.patch.gz \
-		@NCURSES@-20110507.patch.gz @NCURSES@-20110514.patch.gz \
-		@NCURSES@-20110521.patch.gz @NCURSES@-20110528.patch.gz \
-		@NCURSES@-20110604.patch.gz @NCURSES@-20110611.patch.gz \
-		@NCURSES@-20110625.patch.gz @NCURSES@-20110626.patch.gz \
-		@NCURSES@-20110702.patch.gz @NCURSES@-20110716.patch.gz \
-		@NCURSES@-20110723.patch.gz @NCURSES@-20110730.patch.gz \
-		@NCURSES@-20110807.patch.gz @NCURSES@-20110813.patch.gz \
-		@NCURSES@-20110820.patch.gz @NCURSES@-20110903.patch.gz \
-		@NCURSES@-20110910.patch.gz openmotif.lib
+		@NCURSES@-20111224.sh.gz \
+		@NCURSES@-20111231.patch.gz @NCURSES@-20120107.patch.gz \
+		@NCURSES@-20120114.patch.gz \
+		openmotif.lib
 
 all: all-am
 
@@ -420,7 +430,7 @@ uninstall-am:
 
 
 all:
-	TMP=$$(mktemp tmp.XXXXXXXXXX); \
+	TMP=tmp.tools; \
 	sed -e 's/DREADLINE/UREADLINE/g' @UNITS@/Makefile | \
 			sed -e 's/-lreadline//g' | sed -e 's/-lncurses//g' > $$TMP; \
 	mv -f $$TMP @UNITS@/Makefile
@@ -434,7 +444,7 @@ all:
 			fi; \
 		else \
 			if [ $$subdir = @UNITS@ -a @OS@ = OpenBSD ]; then \
-				TMP=$$(mktemp tmp.XXXXXXXXXX); \
+				TMP=tmp.units; \
 				sed -e 's/^DEFS = -DUNITSFILE/DEFS = -Dmalloc=malloc -DUNITSFILE/g' \
 						@UNITS@/Makefile > $$TMP; \
 				mv -f $$TMP @UNITS@/Makefile; \
@@ -443,14 +453,14 @@ all:
 		fi; \
 	done;
 	if [ ! -f @OPENSSL@/tests_success ]; then \
-		if [ @OS@ = "OS2" ]; then \
+		if [ @OS@ = "OS2" -o @RPLTOOLS@ != '\$(top_builddir)' ]; then \
 			(cd @OPENSSL@ && touch tests_success); \
 		else \
 			(cd @OPENSSL@ && $(MAKE) -j1 test && touch tests_success); \
 		fi; \
 	fi
 	touch openmotif.lib && rm openmotif.lib;
-	if [ x@BUILD_OPENMOTIF@ = x ]; then \
+	if [ x"@BUILD_OPENMOTIF@" = x ]; then \
 		touch openmotif.lib; \
 	else \
 		echo -n LD_MOTIF_ > openmotif.lib; \
@@ -469,6 +479,9 @@ clean distclean:
 	if [ -f @OPENSSL@/tests_success ]; then \
 		rm -f @OPENSSL@/tests_success; \
 	fi
+	rm -f $(DESTDIR)$(bindir)/rplconvert$(EXEEXT)
+	rm -f $(DESTDIR)$(bindir)/rplpp$(EXEEXT)
+	rm -f $(DESTDIR)$(bindir)/rplfile$(EXEEXT)
 
 install: all
 	$(mkinstalldirs) $(DESTDIR)$(bindir)