- added the wraster lib dependancies at link time, so they will be

written in the libwraster.la file allowing automatic linking against
  all the libs libwraster depends upon without specifing them again when
  linking programs that use libwraster. -lwraster will be enough.

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

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

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 

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@
 

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@
 

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
 

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