--- rpl/tools/Makefile.am	2010/03/02 09:52:34	1.4
+++ rpl/tools/Makefile.am	2010/03/04 10:09:43	1.5
@@ -13,7 +13,8 @@ all:
 		TMP=$$(mktemp); \
 		if [ -n "$$(grep static $$i | grep dynamic)" ]; then \
 			awk \
-			'{ if (index($$0, "-static") != 0 && index($$0, "-dynamic") != 0) \
+			'{ \
+				if (index($$0, "-static") != 0 && index($$0, "-dynamic") != 0) \
 				{ \
 					for(j = 1; j <= NF; j++) \
 					{ \
@@ -36,10 +37,33 @@ all:
 		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;
+	$(AR) cru $(top_builddir)/tools/@ICONV@/lib/.libs/@LIBICONV@ \
+			$(top_builddir)/tools/@ICONV@/lib/.libs/*.o
+	$(RANLIB) $(top_builddir)/tools/@ICONV@/lib/.libs/@LIBICONV@
 
 clean distclean:
 	@list='$(subdirs)'; for subdir in $$list; do \
@@ -49,10 +73,12 @@ clean distclean:
 
 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
@@ -60,22 +86,8 @@ 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);
 
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install