--- rpl/tools/Attic/Makefile.in	2010/04/17 18:57:45	1.12
+++ rpl/tools/Attic/Makefile.in	2011/09/14 14:34:29	1.58
@@ -47,21 +47,25 @@ CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ABI = @ABI@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BSH_PATH = @BSH_PATH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+COCOA = @COCOA@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+C_STANDARD = @C_STANDARD@
 DATE = @DATE@
 DATE_FR = @DATE_FR@
 DEBUG = @DEBUG@
@@ -72,9 +76,11 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ELF = @ELF@
 EXEEXT = @EXEEXT@
 EXPERIMENTAL_CODE = @EXPERIMENTAL_CODE@
 EXPORT_DYNAMIC = @EXPORT_DYNAMIC@
+EXT_SQL = @EXT_SQL@
 F77 = @F77@
 FC = @FC@
 FCFLAGS = @FCFLAGS@
@@ -82,6 +88,8 @@ FFLAGS = @FFLAGS@
 FILE = @FILE@
 FINAL_ENCODING = @FINAL_ENCODING@
 FORCE_GNUPLOT_PATH = @FORCE_GNUPLOT_PATH@
+GIAC = @GIAC@
+GMP = @GMP@
 GNUPLOT = @GNUPLOT@
 GNUPLOT_COMPILATION = @GNUPLOT_COMPILATION@
 GNUPLOT_P = @GNUPLOT_P@
@@ -91,25 +99,31 @@ GREP = @GREP@
 GS = @GS@
 GSL = @GSL@
 GV = @GV@
+HOST = @HOST@
 ICONV = @ICONV@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPCS_SYSV = @IPCS_SYSV@
+IPV6 = @IPV6@
 LATEX = @LATEX@
 LDFLAGS = @LDFLAGS@
-LIBMTMALLOC = @LIBMTMALLOC@
 LIBOBJS = @LIBOBJS@
+LIBRPLCAS = @LIBRPLCAS@
 LIBS = @LIBS@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MALLOC = @MALLOC@
 MKDIR_P = @MKDIR_P@
 MOTIF_SUPPORT = @MOTIF_SUPPORT@
+MPFR = @MPFR@
 MYSQL_SUPPORT = @MYSQL_SUPPORT@
 NCURSES = @NCURSES@
 NESTED_FUNCTIONS = @NESTED_FUNCTIONS@
+NTL = @NTL@
 OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@
 OS = @OS@
@@ -120,17 +134,21 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARI = @PARI@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POSTGRESQL_SUPPORT = @POSTGRESQL_SUPPORT@
 POSTSCRIPT_SUPPORT = @POSTSCRIPT_SUPPORT@
 PROFILAGE = @PROFILAGE@
 RANLIB = @RANLIB@
 READLINE = @READLINE@
+RPLCAS = @RPLCAS@
 RUNPATH = @RUNPATH@
 SED = @SED@
 SEMAPHORES_NOMMES = @SEMAPHORES_NOMMES@
+SEMUN = @SEMUN@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SIGSEGV = @SIGSEGV@
 SQLITE = @SQLITE@
 STRIP = @STRIP@
 TEX = @TEX@
@@ -198,7 +216,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
-		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@
+		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@
 
 sysconfdir = @sysconfdir@
 target = @target@
@@ -211,7 +229,16 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 EXTRA_DIST = @NCURSES@.tar.gz @READLINE@.tar.gz @UNITS@.tar.gz @GSL@.tar.gz \
 		@GPP@.tar.gz @GNUPLOT@.tar.gz @FILE@.tar.gz @ICONV@.tar.gz \
-		@FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.gz
+		@FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.gz @SIGSEGV@.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
 
 all: all-am
 
@@ -386,30 +413,45 @@ uninstall-am:
 
 all:
 	TMP=$$(mktemp tmp.XXXXXXXXXX); \
-	sed s/DREADLINE/UREADLINE/g @UNITS@/Makefile > $$TMP; \
-	\mv -f $$TMP @UNITS@/Makefile
+	sed -e 's/DREADLINE/UREADLINE/g' @UNITS@/Makefile | \
+			sed -e 's/-lreadline//g' | sed -e 's/-lncurses//g' > $$TMP; \
+	mv -f $$TMP @UNITS@/Makefile
 	@list='$(subdirs)'; for subdir in $$list; do \
 		echo "Making $@ in $$subdir"; \
-		$(MAKE) -C $$subdir $@ ; \
+		if [ $$subdir = @OPENSSL@ ]; then \
+			if [ @OS@ = "OS2" ]; then \
+				$(MAKE) -C $$subdir -j1 -f OS2-EMX.mak2; \
+			else \
+				$(MAKE) -C $$subdir -j1 $@; \
+			fi; \
+		else \
+			if [ $$subdir = @UNITS@ -a @OS@ = OpenBSD ]; then \
+				TMP=$$(mktemp tmp.XXXXXXXXXX); \
+				sed -e 's/^DEFS = -DUNITSFILE/DEFS = -Dmalloc=malloc -DUNITSFILE/g' \
+						@UNITS@/Makefile > $$TMP; \
+				mv -f $$TMP @UNITS@/Makefile; \
+			fi; \
+			$(MAKE) -C $$subdir $@; \
+		fi; \
 	done;
 	if [ ! -f @OPENSSL@/tests_success ]; then \
-		(cd @OPENSSL@ && $(MAKE) test && touch tests_success); \
+		if [ @OS@ = "OS2" ]; then \
+			(cd @OPENSSL@ && touch tests_success); \
+		else \
+			(cd @OPENSSL@ && $(MAKE) -j1 test && touch tests_success); \
+		fi; \
 	fi
-	$(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)
 
 clean distclean:
 	@list='$(subdirs)'; for subdir in $$list; do \
 		echo "Cleaning $$subdir"; \
-		if [ $$subdir = @OPENSSL@ ]; then \
-			$(MAKE) -C $$subdir -j1 $@; \
-		else \
+		if [ ! $$subdir = @OPENSSL@ ]; then \
 			$(MAKE) -C $$subdir $@; \
-		fi;
+		fi; \
 	done;
-	\rm @OPENSSL@/tests_success
+	if [ -f @OPENSSL@/tests_success ]; then \
+		rm -f @OPENSSL@/tests_success; \
+	fi
 
 install: all
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -427,10 +469,10 @@ install: all
 	$(INSTALL_DATA) $(FILE)/magic/magic.mgc \
 			$(DESTDIR)$(datadir)/rplfiles.mgc
 	$(INSTALL_PROGRAM) $(FILE)/src/rplfile$(EXEEXT) \
-			$(DESTDIR)$(bindir)/rplfile$(EXEEXT);
+			$(DESTDIR)$(bindir)/rplfile$(EXEEXT)
 
 uninstall:
-	\rm -f $(DESTDIR)$(bindir)/rplconvert$(EXEEXT) \
+	rm -f $(DESTDIR)$(bindir)/rplconvert$(EXEEXT) \
 			$(DESTDIR)$(datadir)/rplunits \
 			$(DESTDIR)$(bindir)/rplpp$(EXEEXT) \
 			$(DESTDIR)$(mandir)/man1/gpp.1 \