--- rpl/tools/Attic/Makefile.in	2010/02/11 14:19:06	1.3
+++ rpl/tools/Attic/Makefile.in	2010/04/07 13:33:40	1.11
@@ -65,7 +65,6 @@ CYGPATH_W = @CYGPATH_W@
 DATE = @DATE@
 DATE_FR = @DATE_FR@
 DEBUG = @DEBUG@
-DEBUG_CODE = @DEBUG_CODE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DVIPS = @DVIPS@
@@ -111,6 +110,8 @@ MOTIF_SUPPORT = @MOTIF_SUPPORT@
 MYSQL_SUPPORT = @MYSQL_SUPPORT@
 NCURSES = @NCURSES@
 OBJEXT = @OBJEXT@
+OPENSSL = @OPENSSL@
+OS = @OS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -128,6 +129,7 @@ RUNPATH = @RUNPATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SQLITE = @SQLITE@
 STRIP = @STRIP@
 TEX = @TEX@
 UNITS = @UNITS@
@@ -194,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@
@@ -206,7 +208,8 @@ top_build_prefix = @top_build_prefix@
 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
+		@GPP@.tar.gz @GNUPLOT@.tar.gz @FILE@.tar.gz @ICONV@.tar.gz \
+		@FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.gz
 
 all: all-am
 
@@ -284,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
@@ -381,23 +383,88 @@ uninstall-am:
 
 
 all:
+	for i in $(shell find @NCURSES@ -name Makefile \
+		 -exec grep static {} /dev/null \; | cut -d: -f1); \
+	do \
+		echo -n Checking $$i; \
+		TMP=$$(mktemp); \
+		if [ -n "$$(grep static $$i | grep dynamic)" ]; then \
+			awk \
+			'{ \
+				if (index($$0, "-static") != 0 && index($$0, "-dynamic") != 0) \
+				{ \
+					for(j = 1; j <= NF; j++) \
+					{ \
+						if (index($$j, "-static") == 0) \
+						{ \
+							printf("%s ", $$j); \
+						} \
+					} \
+					printf("\n"); \
+				} \
+				else \
+				{ \
+					print; \
+				} \
+			}' $$i > $$TMP; \
+			\mv -f $$TMP $$i; \
+			echo -n " (fixed)"; \
+		else \
+			echo -n " (nothing to do)"; \
+		fi; \
+		echo .; \
+	done;
+	TMP=$$(mktemp); \
+	awk \
+	'{ \
+		if (index($$0, "LDFLAGS") == 1) \
+		{ \
+			if (index($$0, "-static") == 0) \
+			{ \
+				printf("%s -static\n", $$0); \
+			} \
+			else \
+			{ \
+				print; \
+			} \
+		} \
+		else \
+		{ \
+			print; \
+		} \
+	}' @FILE@/src/Makefile > $$TMP; \
+	\mv -f $$TMP @FILE@/src/Makefile
 	@list='$(subdirs)'; for subdir in $$list; do \
 		echo "Making $@ in $$subdir"; \
 		$(MAKE) -C $$subdir $@ ; \
 	done;
+	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.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) $(LDFLAGS)
 
 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)
-	$(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
@@ -405,22 +472,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