--- rpl/tools/Makefile.am	2010/03/04 10:09:43	1.5
+++ rpl/tools/Makefile.am	2010/03/27 13:42:35	1.10
@@ -1,9 +1,9 @@
 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
 
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
-		@FILE@ @ICONV@
+		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@
 
 all:
 	for i in $(shell find @NCURSES@ -name Makefile \
@@ -61,15 +61,24 @@ all:
 		echo "Making $@ in $$subdir"; \
 		$(MAKE) -C $$subdir $@ ; \
 	done;
-	$(AR) cru $(top_builddir)/tools/@ICONV@/lib/.libs/@LIBICONV@ \
+	if [ ! -f @OPENSSL@/tests_success ]; then \
+		(cd @OPENSSL@ && $(MAKE) test && touch tests_success); \
+	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@
+	$(RANLIB) $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
+	$(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)
 
 clean distclean:
 	@list='$(subdirs)'; for subdir in $$list; do \
 		echo "Cleaning $$subdir"; \
-		$(MAKE) -C $$subdir $@ ; \
+		$(MAKE) -C $$subdir $@; \
 	done;
+	\rm @OPENSSL@/tests_success
 
 install: all
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -89,5 +98,14 @@ 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