WINGs/Examples/Makefile.am |   17 +++++++++--------
 WINGs/Extras/Makefile.am   |    9 ++++++---
 WINGs/Makefile.am          |   33 +++++++--------------------------
 WINGs/Tests/Makefile.am    |    5 +++--
 WPrefs.app/Makefile.am     |    5 +++--
 configure.ac               |    2 +-
 src/Makefile.am            |    3 ++-
 test/Makefile.am           |    2 +-
 util/Makefile.am           |   23 +++++++++++++----------
 wmlib/Makefile.am          |    6 ++++--
 10 files changed, 49 insertions(+), 56 deletions(-)

diff --git a/WINGs/Examples/Makefile.am b/WINGs/Examples/Makefile.am
index 4a84abf..9bff662 100644
--- a/WINGs/Examples/Makefile.am
+++ b/WINGs/Examples/Makefile.am
@@ -6,23 +6,24 @@ AUTOMAKE_OPTIONS = no-dependencies
 noinst_PROGRAMS = connect server fontl puzzle colorpick
 
 
-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
+LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
+	$(top_builddir)/WINGs/libWUtil.la \
 	@XFTLIBS@ @INTLIBS@
 
-colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
+colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 
-fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
+fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 
-puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
+puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 
-connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
+connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
 
-connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
+connect_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ \
 	@NETLIBS@ @INTLIBS@
 
-server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
+server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
 
-server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
+server_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ \
 	@NETLIBS@ @INTLIBS@
 
 
diff --git a/WINGs/Extras/Makefile.am b/WINGs/Extras/Makefile.am
index eb96ebf..350fb29 100644
--- a/WINGs/Extras/Makefile.am
+++ b/WINGs/Extras/Makefile.am
@@ -10,24 +10,27 @@ includedir = @includedir@/WINGs
 include_HEADERS = wtableview.h wtabledelegates.h 
 
 
-lib_LIBRARIES = libExtraWINGs.a 
+lib_LTLIBRARIES = libExtraWINGs.la 
 
 noinst_PROGRAMS = test
 
 EXTRA_DIST = 
 
-libExtraWINGs_a_SOURCES = 	\
+libExtraWINGs_la_SOURCES = 	\
 	wtableview.c \
 	wtabledelegates.c \
 	wtableview.h \
 	wtabledelegates.h 
 
+libExtraWINGs_la_LIBADD=$(top_builddir)/WINGs/libWINGs.la
+
 AM_CFLAGS = @NOSTRICTALIASING@
 
 INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
 
-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
+LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
+	$(top_builddir)/WINGs/libWUtil.la \
 	@XFTLIBS@ @INTLIBS@
 
 test_LDADD = wtableview.o wtabledelegates.o $(LDADD)
diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am
index 46ed7ef..0f2afb1 100644
--- a/WINGs/Makefile.am
+++ b/WINGs/Makefile.am
@@ -6,14 +6,16 @@ SUBDIRS = WINGs . po Documentation Resources Examples Extras Tests
 
 
 
-#libWINGs_la_LDFLAGS = -version-info 1:1:0
+libWINGs_la_LDFLAGS = -version-info 2:1:0
+libWINGs_la_LIBADD = libWUtil.la $(top_builddir)/wrlib/libwraster.la -lX11 -lXft
+libWUtil_la_LDFLAGS = -version-info 1:2:0
 
 bin_SCRIPTS = get-wings-flags get-wutil-flags
 
-lib_LIBRARIES = libWINGs.a libWUtil.a
+lib_LTLIBRARIES = libWUtil.la libWINGs.la
 
 
-LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @INTLIBS@
+LDADD= libWUtil.la libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@
 
 
 EXTRA_DIST = BUGS python/Makefile python/README python/WINGs.i \
@@ -21,32 +23,12 @@ EXTRA_DIST = BUGS python/Makefile python/README python/WINGs.i \
 
 
 # wbutton.c 
-libWINGs_a_SOURCES = 	\
-	array.c \
-	bagtree.c \
+libWINGs_la_SOURCES = 	\
 	configuration.c \
-	connection.c \
-	data.c \
 	dragcommon.c \
 	dragdestination.c \
 	dragsource.c \
-	error.c \
-	findfile.c \
-	handlers.c \
-	hashtable.c \
-	host.c \
-	international.c \
-	memory.c \
-	misc.c \
-	notification.c \
-	proplist.c \
 	selection.c \
-	snprintf.c \
-	string.c \
-	tree.c \
-	userdefaults.c \
-	usleep.c \
-	wapplication.c \
 	wappresource.c \
 	wballoon.c \
 	wbox.c \
@@ -82,8 +64,7 @@ libWINGs_a_SOURCES = 	\
 	wview.c \
 	wwindow.c
 
-
-libWUtil_a_SOURCES = 	\
+libWUtil_la_SOURCES = 	\
 	array.c \
 	bagtree.c \
 	connection.c \
diff --git a/WINGs/Tests/Makefile.am b/WINGs/Tests/Makefile.am
index 96842c5..25cda51 100644
--- a/WINGs/Tests/Makefile.am
+++ b/WINGs/Tests/Makefile.am
@@ -4,13 +4,14 @@ AUTOMAKE_OPTIONS = no-dependencies
 
 noinst_PROGRAMS = wtest wmquery wmfile testmywidget 
 
-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
+LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
+	$(top_builddir)/WINGs/libWUtil.la \
 	@XFTLIBS@ @INTLIBS@
 
 
 testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h 
 
-wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
+wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 
 
 EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
diff --git a/WPrefs.app/Makefile.am b/WPrefs.app/Makefile.am
index 37269f9..1d38a8c 100644
--- a/WPrefs.app/Makefile.am
+++ b/WPrefs.app/Makefile.am
@@ -48,10 +48,11 @@ AM_CFLAGS = @NOSTRICTALIASING@
 
 INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
 
-WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
+WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 
 WPrefs_LDADD = \
-	$(top_builddir)/WINGs/libWINGs.a\
+	$(top_builddir)/WINGs/libWINGs.la\
+	$(top_builddir)/WINGs/libWUtil.la\
 	$(top_builddir)/wrlib/libwraster.la \
 	@XFTLIBS@ \
 	@INTLIBS@
diff --git a/configure.ac b/configure.ac
index 1915335..a138b32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -971,7 +971,7 @@ cat <<EOF >get-wings-flags
 
 WCFLAGS="$inc_search_path"
 WLFLAGS="$lib_search_path"
-WLIBS="-lWINGs -lwraster $GFXLIBS $XFTLIBS $XLIBS -lm $NETLIBS $INTLIBS"
+WLIBS="-lWINGs -lWUtil -lwraster $GFXLIBS $XFTLIBS $XLIBS -lm $NETLIBS $INTLIBS"
 
 usage="Usage: get-wings-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#"
 
diff --git a/src/Makefile.am b/src/Makefile.am
index f12dae3..f4b936e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -117,7 +117,8 @@ INCLUDES = \
 
 
 wmaker_LDADD = \
-	$(top_builddir)/WINGs/libWINGs.a\
+	$(top_builddir)/WINGs/libWINGs.la\
+	$(top_builddir)/WINGs/libWUtil.la\
 	$(top_builddir)/wrlib/libwraster.la\
 	@XFTLIBS@ \
 	@XLIBS@ \
diff --git a/test/Makefile.am b/test/Makefile.am
index f57584f..b560e67 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -8,7 +8,7 @@ noinst_PROGRAMS = wtest
 
 wtest_SOURCES = wtest.c
 
-wtest_LDADD = $(top_builddir)/wmlib/libWMaker.a @XLFLAGS@ @XLIBS@ 
+wtest_LDADD = $(top_builddir)/wmlib/libWMaker.la @XLFLAGS@ @XLIBS@ 
 
 
 INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib 
diff --git a/util/Makefile.am b/util/Makefile.am
index 008f89e..4846eef 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -16,44 +16,47 @@ INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
 
 liblist= @LIBRARY_SEARCH_PATH@ @INTLIBS@
 
-wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
+wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
 
-wdread_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
+wdread_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
 
 wxcopy_LDADD = @XLFLAGS@ @XLIBS@ 
 
 wxpaste_LDADD = @XLFLAGS@ @XLIBS@
 
-getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
+getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
 
 getstyle_SOURCES = getstyle.c fontconv.c
 
 setstyle_LDADD = \
-	$(top_builddir)/WINGs/libWUtil.a \
+	$(top_builddir)/WINGs/libWUtil.la \
 	@XLFLAGS@ @XLIBS@ $(liblist)
 
 setstyle_SOURCES = setstyle.c fontconv.c
 
-convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
+convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
 
 convertfonts_SOURCES = convertfonts.c fontconv.c
 
-seticons_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist)
+seticons_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist)
 
-geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist)
+geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist)
 
 wmagnify_LDADD = \
-	$(top_builddir)/WINGs/libWINGs.a \
+	$(top_builddir)/WINGs/libWINGs.la \
+	$(top_builddir)/WINGs/libWUtil.la \
 	$(top_builddir)/wrlib/libwraster.la \
 	@XFTLIBS@ @INTLIBS@ @DLLIBS@
 
 wmsetup_LDADD = \
-	$(top_builddir)/WINGs/libWINGs.a \
+	$(top_builddir)/WINGs/libWINGs.la \
+	$(top_builddir)/WINGs/libWUtil.la \
 	$(top_builddir)/wrlib/libwraster.la \
 	@XFTLIBS@ @INTLIBS@ @DLLIBS@
 
 wmsetbg_LDADD = \
-	$(top_builddir)/WINGs/libWINGs.a \
+	$(top_builddir)/WINGs/libWINGs.la \
+	$(top_builddir)/WINGs/libWUtil.la \
 	$(top_builddir)/wrlib/libwraster.la \
 	@XLIBS@ @XFTLIBS@ @INTLIBS@ @DLLIBS@
 
diff --git a/wmlib/Makefile.am b/wmlib/Makefile.am
index 34cc11e..47677e8 100644
--- a/wmlib/Makefile.am
+++ b/wmlib/Makefile.am
@@ -1,13 +1,15 @@
 
 AUTOMAKE_OPTIONS = no-dependencies
 
-lib_LIBRARIES = libWMaker.a
+libWMaker_la_LDFLAGS = -version-info 1:1:0
+libWMaker_la_LIBADD = -lX11
+lib_LTLIBRARIES = libWMaker.la
 
 include_HEADERS = WMaker.h
 
 INCLUDES = $(DFLAGS) @XCFLAGS@
 
-libWMaker_a_SOURCES = 	\
+libWMaker_la_SOURCES = 	\
 	menu.c 		\
 	app.c 		\
 	event.c 	\