diff --git a/WINGs/Examples/Makefile.am b/WINGs/Examples/Makefile.am
index 6d4dbe9c..3bd064f8 100644
--- a/WINGs/Examples/Makefile.am
+++ b/WINGs/Examples/Makefile.am
@@ -7,8 +7,7 @@ noinst_PROGRAMS = connect fontl puzzle
 
 
 LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
-	 @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ \
-	-lm @LIBPL@
+	@LIBPL@
 
 
 fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am
index 7ed8ced9..0b189b85 100644
--- a/WINGs/Makefile.am
+++ b/WINGs/Makefile.am
@@ -15,9 +15,7 @@ bin_SCRIPTS = get-wings-flags get-wutil-flags
 lib_LIBRARIES = libWINGs.a libWUtil.a
 
 
-LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la\
-	 @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ \
-	-lm @LIBPL@
+LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @LIBPL@
 
 
 EXTRA_DIST = BUGS
diff --git a/WINGs/Tests/Makefile.am b/WINGs/Tests/Makefile.am
index 5fc56290..caad47b5 100644
--- a/WINGs/Tests/Makefile.am
+++ b/WINGs/Tests/Makefile.am
@@ -5,8 +5,7 @@ AUTOMAKE_OPTIONS = no-dependencies
 noinst_PROGRAMS = wtest wmquery wmfile testmywidget testcolorpanel 
 
 LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
-	@LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ \
-	-lm @LIBPL@
+	@LIBPL@
 
 
 testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h 
diff --git a/WPrefs.app/Makefile.am b/WPrefs.app/Makefile.am
index 25bc0cad..13ba3709 100644
--- a/WPrefs.app/Makefile.am
+++ b/WPrefs.app/Makefile.am
@@ -44,20 +44,13 @@ WPrefs_SOURCES = \
 
 CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
 
-INCLUDES = \
-	-I$(top_srcdir)/wrlib \
-	-I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
+INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
 
 WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
 
 WPrefs_LDADD = \
 	$(top_builddir)/WINGs/libWINGs.a\
 	$(top_builddir)/wrlib/libwraster.la \
-	@LIBRARY_SEARCH_PATH@ \
 	@LIBPL@ \
-	@GFXLIBS@ \
-	@XLIBS@ \
-	@X_EXTRA_LIBS@ \
-	@INTLIBS@ \
-	-lm 
+	@INTLIBS@
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 56aad9db..67080da6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -117,11 +117,8 @@ INCLUDES = \
 wmaker_LDADD = \
 	$(top_builddir)/WINGs/libWINGs.a\
 	$(top_builddir)/wrlib/libwraster.la\
-	@LIBRARY_SEARCH_PATH@ \
 	@LIBPL@ \
-	@GFXLIBS@ \
 	@XLIBS@ \
 	@INTLIBS@ \
-	@DLLIBS@ \
-	-lm 
+	@DLLIBS@
 
diff --git a/util/Makefile.am b/util/Makefile.am
index def435af..63f5fbbf 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -15,6 +15,8 @@ INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
 	-DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
 
 # X_EXTRA_LIBS is for libproplist in systems that need -lsocket
+# remove after we require lPL 0.10.2 which automatically resolves its
+# library dependancies using the libPropList.la file
 liblist= @LIBRARY_SEARCH_PATH@ @LIBPL@ @X_EXTRA_LIBS@
 
 wdwrite_LDADD = $(liblist)
@@ -34,23 +36,20 @@ geticonset_LDADD= $(liblist)
 wmagnify_LDADD = \
 	$(top_builddir)/WINGs/libWINGs.a \
 	$(top_builddir)/wrlib/libwraster.la \
-	@LIBRARY_SEARCH_PATH@ \
 	@LIBPL@ \
-	@GFXLIBS@ @XLIBS@ @DLLIBS@ -lm
+	@DLLIBS@
 
 wmsetup_LDADD = \
 	$(top_builddir)/WINGs/libWINGs.a \
 	$(top_builddir)/wrlib/libwraster.la \
-	@LIBRARY_SEARCH_PATH@ \
 	@LIBPL@ \
-	@GFXLIBS@ @XLIBS@ @DLLIBS@ -lm
+	@DLLIBS@
 
 wmsetbg_LDADD = \
 	$(top_builddir)/WINGs/libWINGs.a \
 	$(top_builddir)/wrlib/libwraster.la \
-	@LIBRARY_SEARCH_PATH@ \
 	@LIBPL@ \
-	@GFXLIBS@ @XLIBS@ @DLLIBS@ -lm
+	@DLLIBS@
 
 CLEANFILES = wmaker.inst
 
diff --git a/wrlib/Makefile.am b/wrlib/Makefile.am
index cfeba49b..ac4d7c52 100644
--- a/wrlib/Makefile.am
+++ b/wrlib/Makefile.am
@@ -59,7 +59,7 @@ x86_specific.o: x86_specific.c
 
 INCLUDES = $(DFLAGS) @HEADER_SEARCH_PATH@
 
-LIBLIST = $(top_builddir)/wrlib/libwraster.la @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm
+LIBLIST = $(top_builddir)/wrlib/libwraster.la
 
 view_SOURCES= view.c
 
@@ -79,6 +79,6 @@ testdraw_SOURCES = testdraw.c
 testdraw_LDADD = $(LIBLIST)
 
 
-libwraster_la_LIBADD = @ALLOCA@ 
+libwraster_la_LIBADD = @ALLOCA@ @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm