--- rpl/tools/Attic/Makefile.in	2010/03/04 10:09:43	1.6
+++ rpl/tools/Attic/Makefile.in	2010/03/06 18:29:14	1.7
@@ -98,7 +98,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LATEX = @LATEX@
 LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
 LIBMTMALLOC = @LIBMTMALLOC@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -111,6 +110,7 @@ MOTIF_SUPPORT = @MOTIF_SUPPORT@
 MYSQL_SUPPORT = @MYSQL_SUPPORT@
 NCURSES = @NCURSES@
 OBJEXT = @OBJEXT@
+OPENSSL = @OPENSSL@
 OS = @OS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -129,6 +129,7 @@ RUNPATH = @RUNPATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SQLITE = @SQLITE@
 STRIP = @STRIP@
 TEX = @TEX@
 UNITS = @UNITS@
@@ -195,7 +196,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 +209,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 +287,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
@@ -438,9 +438,9 @@ all:
 		echo "Making $@ in $$subdir"; \
 		$(MAKE) -C $$subdir $@ ; \
 	done;
-	$(AR) cru $(top_builddir)/tools/@ICONV@/lib/.libs/@LIBICONV@ \
+	$(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@
+	$(RANLIB) $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
 
 clean distclean:
 	@list='$(subdirs)'; for subdir in $$list; do \
@@ -466,6 +466,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