--- rpl/tools/Attic/Makefile.in	2010/04/07 07:23:03	1.10
+++ rpl/tools/Attic/Makefile.in	2010/09/07 20:59:15	1.33
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -41,6 +43,7 @@ am__configure_deps = $(am__aclocal_m4_de
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/rplconfig.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -50,6 +53,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BROKEN_SIGINFO = @BROKEN_SIGINFO@
+BSH_PATH = @BSH_PATH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -59,6 +64,7 @@ CXX = @CXX@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+C_STANDARD = @C_STANDARD@
 DATE = @DATE@
 DATE_FR = @DATE_FR@
 DEBUG = @DEBUG@
@@ -71,6 +77,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@
@@ -93,19 +101,21 @@ 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@
 MYSQL_SUPPORT = @MYSQL_SUPPORT@
 NCURSES = @NCURSES@
+NESTED_FUNCTIONS = @NESTED_FUNCTIONS@
 OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@
 OS = @OS@
@@ -114,6 +124,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POSTGRESQL_SUPPORT = @POSTGRESQL_SUPPORT@
@@ -123,6 +134,8 @@ RANLIB = @RANLIB@
 READLINE = @READLINE@
 RUNPATH = @RUNPATH@
 SED = @SED@
+SEMAPHORES_NOMMES = @SEMAPHORES_NOMMES@
+SEMUN = @SEMUN@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQLITE = @SQLITE@
@@ -200,11 +213,12 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+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 \
-		@FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.gz
+		@FILE@.diff.gz @SQLITE@.tar.gz @SQLITE@.diff.gz @OPENSSL@.tar.gz
 
 all: all-am
 
@@ -213,14 +227,14 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tools/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  tools/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu tools/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -238,6 +252,7 @@ $(top_srcdir)/configure:  $(am__configur
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 
@@ -261,13 +276,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -288,6 +307,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -306,6 +326,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -314,18 +336,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -360,87 +392,50 @@ uninstall-am:
 
 
 all:
-	for i in $(shell find @NCURSES@ -name Makefile \
-		 -exec grep static {} /dev/null \; | cut -d: -f1); \
-	do \
-		echo -n Checking $$i; \
-		TMP=$$(mktemp); \
-		if [ -n "$$(grep static $$i | grep dynamic)" ]; then \
-			awk \
-			'{ \
-				if (index($$0, "-static") != 0 && index($$0, "-dynamic") != 0) \
-				{ \
-					for(j = 1; j <= NF; j++) \
-					{ \
-						if (index($$j, "-static") == 0) \
-						{ \
-							printf("%s ", $$j); \
-						} \
-					} \
-					printf("\n"); \
-				} \
-				else \
-				{ \
-					print; \
-				} \
-			}' $$i > $$TMP; \
-			\mv -f $$TMP $$i; \
-			echo -n " (fixed)"; \
-		else \
-			echo -n " (nothing to do)"; \
-		fi; \
-		echo .; \
-	done;
-	TMP=$$(mktemp); \
-	awk \
-	'{ \
-		if (index($$0, "LDFLAGS") == 1) \
-		{ \
-			if (index($$0, "-static") == 0) \
-			{ \
-				printf("%s -static\n", $$0); \
-			} \
-			else \
-			{ \
-				print; \
-			} \
-		} \
-		else \
-		{ \
-			print; \
-		} \
-	}' @FILE@/src/Makefile > $$TMP; \
-	\mv -f $$TMP @FILE@/src/Makefile
+	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;
 	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) test && touch tests_success); \
+		fi; \
 	fi
-	$(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
-<<<<<<< Makefile.in
 	$(CC) -o $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
-			$(top_builddir)/tools/@FILE@/src/file.o \
-			$(top_builddir)/tools/@FILE@/src/.libs/librplfile.a \
+			$(top_builddir)/tools/@FILE@/src/*.o \
 			$(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \
 			cut -d= -f2) $(LDFLAGS)
-=======
-	$(CC) -o $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
-			$(top_builddir)/tools/@FILE@/src/file.o \
-			$(top_builddir)/tools/@FILE@/src/.libs/librplfile.a \
-			$(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \
-			cut -d= -f2)
->>>>>>> 1.9
 
 clean distclean:
 	@list='$(subdirs)'; for subdir in $$list; do \
 		echo "Cleaning $$subdir"; \
-		$(MAKE) -C $$subdir $@; \
+		if [ ! $$subdir = @OPENSSL@ ]; then \
+			$(MAKE) -C $$subdir $@; \
+		fi; \
 	done;
-	\rm @OPENSSL@/tests_success
+	if [ -f @OPENSSL@/tests_success ]; then \
+		rm -f @OPENSSL@/tests_success; \
+	fi
 
 install: all
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -458,10 +453,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 \
@@ -471,6 +466,7 @@ uninstall:
 
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+
 # 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.
 .NOEXPORT: