--- rpl/tools/Attic/Makefile.in	2010/03/04 10:09:43	1.6
+++ rpl/tools/Attic/Makefile.in	2010/05/05 08:36:32	1.15
@@ -74,6 +74,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 EXPERIMENTAL_CODE = @EXPERIMENTAL_CODE@
+EXPORT_DYNAMIC = @EXPORT_DYNAMIC@
 F77 = @F77@
 FC = @FC@
 FCFLAGS = @FCFLAGS@
@@ -98,11 +99,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LATEX = @LATEX@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBMTMALLOC = @LIBMTMALLOC@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
-LIBTOOLIZE = @LIBTOOLIZE@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
@@ -110,7 +108,9 @@ MKDIR_P = @MKDIR_P@
 MOTIF_SUPPORT = @MOTIF_SUPPORT@
 MYSQL_SUPPORT = @MYSQL_SUPPORT@
 NCURSES = @NCURSES@
+NESTED_FUNCTIONS = @NESTED_FUNCTIONS@
 OBJEXT = @OBJEXT@
+OPENSSL = @OPENSSL@
 OS = @OS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -127,8 +127,10 @@ RANLIB = @RANLIB@
 READLINE = @READLINE@
 RUNPATH = @RUNPATH@
 SED = @SED@
+SEMAPHORES_NOMMES = @SEMAPHORES_NOMMES@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SQLITE = @SQLITE@
 STRIP = @STRIP@
 TEX = @TEX@
 UNITS = @UNITS@
@@ -195,7 +197,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@
@@ -208,7 +210,7 @@ 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
+		@FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.gz
 
 all: all-am
 
@@ -286,7 +288,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
@@ -383,70 +384,31 @@ 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 s/DREADLINE/UREADLINE/g @UNITS@/Makefile > $$TMP; \
+	\mv -f $$TMP @UNITS@/Makefile
 	@list='$(subdirs)'; for subdir in $$list; do \
 		echo "Making $@ in $$subdir"; \
 		$(MAKE) -C $$subdir $@ ; \
 	done;
-	$(AR) cru $(top_builddir)/tools/@ICONV@/lib/.libs/@LIBICONV@ \
-			$(top_builddir)/tools/@ICONV@/lib/.libs/*.o
-	$(RANLIB) $(top_builddir)/tools/@ICONV@/lib/.libs/@LIBICONV@
+	if [ ! -f @OPENSSL@/tests_success ]; then \
+		(cd @OPENSSL@ && $(MAKE) test && touch tests_success); \
+	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"; \
-		$(MAKE) -C $$subdir $@ ; \
+		if [ $$subdir = @OPENSSL@ ]; then \
+			$(MAKE) -C $$subdir -j1 $@; \
+		else \
+			$(MAKE) -C $$subdir $@; \
+		fi;
 	done;
+	\rm @OPENSSL@/tests_success
 
 install: all
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -466,6 +428,15 @@ install: all
 	$(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