--- rpl/src/Makefile.am	2011/10/04 19:32:35	1.66
+++ rpl/src/Makefile.am	2011/10/05 13:14:18	1.67
@@ -419,9 +419,9 @@ CLEANFILES= $(SRCCc) $(SRCHc) $(SRCCPPc)
 nodist_rpl_SOURCES = \
 		$(SRCCc) $(SRCHc) $(SRCCPPc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
 		$(SRCXPM) $(SRCINCc)
-rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@ @ELF@ -Wl,-whole-archive \
-			 $(ldadd_libmotif) $(LD_MOTIF_LIBS) $(LD_MOTIF_X_XMU) \
-			 -Wl,-no-whole-archive
+rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@ @ELF@ @WHOLE_LIB1@ \
+			 $(ldadd_libmotif) $(LD_MOTIF_LIBS) \
+			 $(LD_MOTIF_X_XMU) @WHOLE_LIB2@
 rpl_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \
 		 -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@
 rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c