--- rpl/tools/Makefile.am	2010/02/11 14:19:06	1.2
+++ rpl/tools/Makefile.am	2011/03/06 16:01:28	1.28
@@ -1,27 +1,61 @@
 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
+		@GPP@.tar.gz @GNUPLOT@.tar.gz @FILE@.tar.gz @ICONV@.tar.gz \
+		@FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.gz \
+		@NCURSES@*.patch.gz
 
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
-		@FILE@ @ICONV@
+		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@
 
 all:
+	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 \
+		if [ @OS@ = "OS2" ]; then \
+			(cd @OPENSSL@ && touch tests_success); \
+		else \
+			(cd @OPENSSL@ && $(MAKE) -j1 test && touch tests_success); \
+		fi; \
+	fi
 
 clean distclean:
 	@list='$(subdirs)'; for subdir in $$list; do \
 		echo "Cleaning $$subdir"; \
-		$(MAKE) -C $$subdir $@ ; \
+		if [ ! $$subdir = @OPENSSL@ ]; then \
+			$(MAKE) -C $$subdir $@; \
+		fi; \
 	done;
+	if [ -f @OPENSSL@/tests_success ]; then \
+		rm -f @OPENSSL@/tests_success; \
+	fi
 
 install: all
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	$(INSTALL_PROGRAM) $(UNITS)/units $(DESTDIR)$(bindir)/rplconvert
+	$(INSTALL_PROGRAM) $(UNITS)/units$(EXEEXT) \
+			$(DESTDIR)$(bindir)/rplconvert$(EXEEXT)
 	$(mkinstalldirs) $(DESTDIR)$(datadir)
 	$(INSTALL_DATA) $(srcdir)/$(UNITS)/units.dat $(DESTDIR)$(datadir)/rplunits
-	$(INSTALL_PROGRAM) $(GPP)/src/gpp $(DESTDIR)$(bindir)/rplpp
+	$(INSTALL_PROGRAM) $(GPP)/src/gpp$(EXEEXT) \
+			$(DESTDIR)$(bindir)/rplpp$(EXEEXT)
 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
 	$(INSTALL_DATA) $(srcdir)/$(GPP)/doc/gpp.1 $(DESTDIR)$(mandir)/man1
 	ln -sf $(DESTDIR)$(mandir)/man1/gpp.1 $(DESTDIR)$(mandir)/man1/rplpp.1
@@ -29,22 +63,17 @@ install: all
 			$(MAKE) $(AM_MAKEFLAGS) -C @GNUPLOT@ $@; fi
 	$(INSTALL_DATA) $(FILE)/magic/magic.mgc \
 			$(DESTDIR)$(datadir)/rplfiles.mgc
-	if [ -z "$(head -n1 $(FILE)/src/file | grep '^#!')" ]; then \
-		$(INSTALL_PROGRAM) $(FILE)/src/.libs/rplfile \
-				$(DESTDIR)$(bindir)/rplfile; \
-	else \
-		$(INSTALL_PROGRAM) $(FILE)/src/rplfile \
-				$(DESTDIR)$(bindir)/rplfile; \
-	fi
-	if [ -f $(FILE)/src/.libs/librplfile.so ]; then \
-		$(INSTALL_DATA) $(FILE)/src/.libs/librplfile.so.1 \
-				$(DESTDIR)$(libdir)/librplfile.so.1; \
-	else \
-		$(INSTALL_DATA) $(FILE)/src/librplfile.so.1 \
-				$(DESTDIR)$(libdir)/librplfile.so.1; \
-	fi
-	ln -sf $(DESTDIR)$(libdir)/librplfile.so.1 \
-			$(DESTDIR)$(libdir)/librplfile.so
+	$(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