--- rpl/tools/Makefile.am	2010/01/26 15:22:47	1.1
+++ rpl/tools/Makefile.am	2016/07/19 08:18:30	1.137
@@ -1,52 +1,96 @@
 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 \
+		@OPENMOTIF@.tar.gz @SIGSEGV@.tar.gz @LIBXPM@.tar.gz @ZLIB@.tar.gz \
+		@NCURSES@-20150613.patch.gz @NCURSES@-20150627.patch.gz \
+		@NCURSES@-20150704.patch.gz @NCURSES@-20150711.patch.gz \
+		@NCURSES@-20150719.patch.gz @NCURSES@-20150725.patch.gz \
+		@NCURSES@-20150808.patch.gz @NCURSES@-20150810.patch.gz \
+		@NCURSES@-20150815.patch.gz @NCURSES@-20150822.patch.gz \
+		@NCURSES@-20150905.patch.gz @NCURSES@-20150912.patch.gz \
+		@NCURSES@-20150919.patch.gz @NCURSES@-20150926.patch.gz \
+		@NCURSES@-20151010.patch.gz @NCURSES@-20151017.patch.gz \
+		@NCURSES@-20151024.patch.gz @NCURSES@-20151101.patch.gz \
+		@NCURSES@-20151107.patch.gz @NCURSES@-20151121.patch.gz \
+		@NCURSES@-20151128.patch.gz @NCURSES@-20151205.patch.gz \
+		@NCURSES@-20151212.patch.gz @NCURSES@-20151219.patch.gz \
+		@NCURSES@-20151226.patch.gz @NCURSES@-20160102.patch.gz \
+		@NCURSES@-20160116.patch.gz @NCURSES@-20160123.patch.gz \
+		@NCURSES@-20160130.patch.gz @NCURSES@-20160206.patch.gz \
+		@NCURSES@-20160213.patch.gz @NCURSES@-20160220.patch.gz \
+		@NCURSES@-20160305.patch.gz @NCURSES@-20160312.patch.gz \
+		@NCURSES@-20160319.patch.gz @NCURSES@-20160326.patch.gz \
+		@NCURSES@-20160402.patch.gz @NCURSES@-20160409.patch.gz \
+		@NCURSES@-20160416.patch.gz @NCURSES@-20160423.patch.gz \
+		@NCURSES@-20160507.patch.gz @NCURSES@-20160514.patch.gz \
+		@NCURSES@-20160521.patch.gz @NCURSES@-20160528.patch.gz \
+		@NCURSES@-20160604.patch.gz @NCURSES@-20160611.patch.gz \
+		@NCURSES@-20160618.patch.gz @NCURSES@-20160625.patch.gz \
+		@NCURSES@-20160702.patch.gz @NCURSES@-20160709.patch.gz
 
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
-		@FILE@ @ICONV@
+		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@ \
+		@ZLIB@
 
 all:
-	@list='$(subdirs)'; for subdir in $$list; do \
-		echo "Making $@ in $$subdir"; \
-		$(MAKE) -C $$subdir $@ ; \
-	done;
-	$(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
+	test -f openmotif.lib && rm -f openmotif.lib;
+	if [ x"@BUILD_OPENMOTIF@" = x ]; then \
+		touch openmotif.lib; \
+	else \
+		echo -n LD_MOTIF_ > openmotif.lib; \
+		grep "^LIBS=" @OPENMOTIF@/config.log | \
+				tr -d "'" >> openmotif.lib; \
+		echo -n LD_MOTIF_ >> openmotif.lib; \
+		grep "^X_XMU" @OPENMOTIF@/config.log | \
+				tr -d "'" >> openmotif.lib; \
+	fi
+	if [ x"@GNUPLOT_COMPILATION@" != x ]; then \
+			$(MAKE) $(AM_MAKEFLAGS) -C @GNUPLOT@ $@; 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
+	rm -f $(DESTDIR)$(bindir)/rplconvert$(EXEEXT)
+	rm -f $(DESTDIR)$(bindir)/rplpp$(EXEEXT)
+	rm -f $(DESTDIR)$(bindir)/rplfile$(EXEEXT)
 
 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_DATA) $(srcdir)/$(UNITS)/definitions.units \
+			$(DESTDIR)$(datadir)/rplunits.tmp
+	sed 's/^!include currency.units//g' $(DESTDIR)$(datadir)/rplunits.tmp \
+			> $(DESTDIR)$(datadir)/rplunits
+	rm -f $(DESTDIR)$(datadir)/rplunits.tmp
+	$(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
-	if [ @GNUPLOT_COMPILATION@ ]; then $(MAKE) -C @GNUPLOT@ $@; fi
+	if [ @GNUPLOT_COMPILATION@ ]; then \
+			$(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