--- rpl/src/Makefile.am	2010/08/25 16:40:56	1.38
+++ rpl/src/Makefile.am	2010/09/07 13:31:54	1.41
@@ -40,6 +40,10 @@ hash = -Drplpp_md5="\"$(shell $(top_buil
 		$(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \
 		-Drpliconv_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
 		$(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \
+		-Drplawk_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
+		$(top_builddir)/rplawk/rplawk$(EXEEXT))\"" \
+		-Drplawk_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
+		$(top_builddir)/rplawk/rplawk$(EXEEXT))\"" \
 		-Drplconvert_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
 		$(top_builddir)/tools/@UNITS@/units$(EXEEXT))\"" \
 		-Drplconvert_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
@@ -414,7 +418,7 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
 		-Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG@ \
 		@MOTIF_SUPPORT@ @POSTSCRIPT_SUPPORT@ @GNUPLOT_SUPPORT@ \
 		@VIM_SUPPORT@ @MYSQL_SUPPORT@ @POSTGRESQL_SUPPORT@ \
-		@SEMAPHORES_NOMMES@ @SEMAPHORES_SYSV@ @IPCS_SYSV@ @SEMUN@ @IPV6@ \
+		@SEMAPHORES_NOMMES@ @IPCS_SYSV@ @SEMUN@ @IPV6@ \
 		@EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
 		-Dd_locale=\"@FINAL_ENCODING@\" \
 		-D@OS@
@@ -468,8 +472,10 @@ librpl: install-libLIBRARIES
 			L="start"; \
 			while test -n "$$L"; \
 			do \
+				echo -n "Remaining files "; \
+				find . -name "*.$(OBJEXT)" | wc -l; \
 				L=""; j=0; \
-				for i in `ls *.$(OBJEXT) 2> /dev/null`; \
+				for i in `find . -name "*.$(OBJEXT)"`; \
 				do \
 					k=`echo $$i | wc -c`; \
 					j=`expr $$j + $$k + 1`; \
@@ -479,12 +485,14 @@ librpl: install-libLIBRARIES
 						break; \
 					fi; \
 				done; \
-				ar cru librpl.a $$L; \
-				rm -f $$L; \
-				echo -n "Remaining files "; \
-				ls *.$(OBJEXT) 2> /dev/null | wc -l; \
+				if test -n "$$L"; then \
+					echo -n "Adding files to librpl.a archive... "; \
+					ar cru librpl.a $$L; \
+					rm -f $$L; \
+					echo "done"; \
+				fi; \
 			done; \
-			echo Done; \
+			echo Archive created; \
 			ar s librpl.a; \
 			if [ @OS@ != OS2 ]; then \
 				echo Stripping librpl.a && strip -d librpl.a; \