--- rpl/tools/Makefile.am	2010/03/27 10:23:34	1.9
+++ rpl/tools/Makefile.am	2010/03/27 13:42:35	1.10
@@ -67,11 +67,16 @@ all:
 	$(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
+	$(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"; \
-		if [ @SQLITE@ != $$subdir ]; then $(MAKE) -C $$subdir $@; fi; \
+		$(MAKE) -C $$subdir $@; \
 	done;
 	\rm @OPENSSL@/tests_success
 
@@ -90,7 +95,7 @@ install: all
 			$(MAKE) $(AM_MAKEFLAGS) -C @GNUPLOT@ $@; fi
 	$(INSTALL_DATA) $(FILE)/magic/magic.mgc \
 			$(DESTDIR)$(datadir)/rplfiles.mgc
-	$(INSTALL_PROGRAM) $(FILE)/src/.libs/rplfile$(EXEEXT) \
+	$(INSTALL_PROGRAM) $(FILE)/src/rplfile$(EXEEXT) \
 			$(DESTDIR)$(bindir)/rplfile$(EXEEXT);
 
 uninstall: