--- rpl/tools/Attic/Makefile.in	2010/02/10 10:14:35	1.2
+++ rpl/tools/Attic/Makefile.in	2011/06/01 08:29:03	1.46
@@ -53,19 +53,22 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BROKEN_SIGINFO = @BROKEN_SIGINFO@
+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@
-DEBUG_CODE = @DEBUG_CODE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DVIPS = @DVIPS@
@@ -75,6 +78,8 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 EXPERIMENTAL_CODE = @EXPERIMENTAL_CODE@
+EXPORT_DYNAMIC = @EXPORT_DYNAMIC@
+EXT_SQL = @EXT_SQL@
 F77 = @F77@
 FC = @FC@
 FCFLAGS = @FCFLAGS@
@@ -82,6 +87,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@
@@ -97,20 +104,26 @@ 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@
 LIBS = @LIBS@
-LIBTOOLIZE = @LIBTOOLIZE@
 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@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -118,6 +131,7 @@ 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@
@@ -126,8 +140,11 @@ RANLIB = @RANLIB@
 READLINE = @READLINE@
 RUNPATH = @RUNPATH@
 SED = @SED@
+SEMAPHORES_NOMMES = @SEMAPHORES_NOMMES@
+SEMUN = @SEMUN@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SQLITE = @SQLITE@
 STRIP = @STRIP@
 TEX = @TEX@
 UNITS = @UNITS@
@@ -194,7 +211,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
-		@FILE@ @ICONV@
+		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@
 
 sysconfdir = @sysconfdir@
 target = @target@
@@ -206,7 +223,12 @@ top_build_prefix = @top_build_prefix@
 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
+		@GPP@.tar.gz @GNUPLOT@.tar.gz @FILE@.tar.gz @ICONV@.tar.gz \
+		@FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.gz \
+		@NCURSES@-20110409.patch.gz @NCURSES@-20110416.patch.gz \
+		@NCURSES@-5.9-20110423.patch.gz @NCURSES@-5.9-20110430.patch.gz \
+		@NCURSES@-5.9-20110507.patch.gz @NCURSES@-5.9-20110514.patch.gz \
+		@NCURSES@-5.9-20110521.patch.gz @NCURSES@-5.9-20110528.patch.gz
 
 all: all-am
 
@@ -284,7 +306,6 @@ all-am: Makefile
 installdirs:
 install-exec: install-exec-am
 install-data: install-data-am
-uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
@@ -381,48 +402,73 @@ uninstall-am:
 
 
 all:
+	TMP=$$(mktemp tmp.XXXXXXXXXX); \
+	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;
-	$(AR) cru $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a \
-			$(top_builddir)/tools/@ICONV@/lib/.libs/*.o
-	$(RANLIB) $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
+	if [ ! -f @OPENSSL@/tests_success ]; then \
+		if [ @OS@ = "OS2" ]; then \
+			(cd @OPENSSL@ && touch tests_success); \
+		else \
+			(cd @OPENSSL@ && $(MAKE) -j1 test && touch tests_success); \
+		fi; \
+	fi
 
 clean distclean:
 	@list='$(subdirs)'; for subdir in $$list; do \
 		echo "Cleaning $$subdir"; \
-		$(MAKE) -C $$subdir $@ ; \
+		if [ ! $$subdir = @OPENSSL@ ]; then \
+			$(MAKE) -C $$subdir $@; \
+		fi; \
 	done;
+	if [ -f @OPENSSL@/tests_success ]; then \
+		rm -f @OPENSSL@/tests_success; \
+	fi
 
 install: all
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	$(INSTALL_PROGRAM) $(UNITS)/units $(DESTDIR)$(bindir)/rplconvert
+	$(INSTALL_PROGRAM) $(UNITS)/units$(EXEEXT) \
+			$(DESTDIR)$(bindir)/rplconvert$(EXEEXT)
 	$(mkinstalldirs) $(DESTDIR)$(datadir)
 	$(INSTALL_DATA) $(srcdir)/$(UNITS)/units.dat $(DESTDIR)$(datadir)/rplunits
-	$(INSTALL_PROGRAM) $(GPP)/src/gpp $(DESTDIR)$(bindir)/rplpp
+	$(INSTALL_PROGRAM) $(GPP)/src/gpp$(EXEEXT) \
+			$(DESTDIR)$(bindir)/rplpp$(EXEEXT)
 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
 	$(INSTALL_DATA) $(srcdir)/$(GPP)/doc/gpp.1 $(DESTDIR)$(mandir)/man1
 	ln -sf $(DESTDIR)$(mandir)/man1/gpp.1 $(DESTDIR)$(mandir)/man1/rplpp.1
-	if [ @GNUPLOT_COMPILATION@ ]; then $(MAKE) -C @GNUPLOT@ $@; fi
+	if [ @GNUPLOT_COMPILATION@ ]; then \
+			$(MAKE) $(AM_MAKEFLAGS) -C @GNUPLOT@ $@; fi
 	$(INSTALL_DATA) $(FILE)/magic/magic.mgc \
 			$(DESTDIR)$(datadir)/rplfiles.mgc
-	if [ -z "$(head -n1 $(FILE)/src/file | grep '^#!')" ]; then \
-		$(INSTALL_PROGRAM) $(FILE)/src/.libs/rplfile \
-				$(DESTDIR)$(bindir)/rplfile; \
-	else \
-		$(INSTALL_PROGRAM) $(FILE)/src/rplfile \
-				$(DESTDIR)$(bindir)/rplfile; \
-	fi
-	if [ -f $(FILE)/src/.libs/librplfile.so ]; then \
-		$(INSTALL_DATA) $(FILE)/src/.libs/librplfile.so.1 \
-				$(DESTDIR)$(libdir)/librplfile.so.1; \
-	else \
-		$(INSTALL_DATA) $(FILE)/src/librplfile.so.1 \
-				$(DESTDIR)$(libdir)/librplfile.so.1; \
-	fi
-	ln -sf $(DESTDIR)$(libdir)/librplfile.so.1 \
-			$(DESTDIR)$(libdir)/librplfile.so
+	$(INSTALL_PROGRAM) $(FILE)/src/rplfile$(EXEEXT) \
+			$(DESTDIR)$(bindir)/rplfile$(EXEEXT)
+
+uninstall:
+	rm -f $(DESTDIR)$(bindir)/rplconvert$(EXEEXT) \
+			$(DESTDIR)$(datadir)/rplunits \
+			$(DESTDIR)$(bindir)/rplpp$(EXEEXT) \
+			$(DESTDIR)$(mandir)/man1/gpp.1 \
+			$(DESTDIR)$(mandir)/man1/rplpp.1 \
+			$(DESTDIR)$(datadir)/rplfiles.mgc \
+			$(DESTDIR)$(bindir)/rplfile$(EXEEXT)
 
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install