diff -pruN wmaker-cvs-20060427/WINGs/Examples/Makefile.am wmaker-cvs-20060427-sowings/WINGs/Examples/Makefile.am --- wmaker-cvs-20060427/WINGs/Examples/Makefile.am 2008-04-30 22:45:26.000000000 +0200 +++ wmaker-cvs-20060427-sowings/WINGs/Examples/Makefile.am 2008-06-02 10:29:36.000000000 +0200 @@ -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 -pruN wmaker-cvs-20060427/WINGs/Extras/Makefile.am wmaker-cvs-20060427-sowings/WINGs/Extras/Makefile.am --- wmaker-cvs-20060427/WINGs/Extras/Makefile.am 2008-04-30 22:45:26.000000000 +0200 +++ wmaker-cvs-20060427-sowings/WINGs/Extras/Makefile.am 2008-06-02 10:29:36.000000000 +0200 @@ -10,13 +10,13 @@ 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 \ @@ -27,7 +27,8 @@ 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 -pruN wmaker-cvs-20060427/WINGs/Makefile.am wmaker-cvs-20060427-sowings/WINGs/Makefile.am --- wmaker-cvs-20060427/WINGs/Makefile.am 2008-04-30 22:49:59.000000000 +0200 +++ wmaker-cvs-20060427-sowings/WINGs/Makefile.am 2008-06-02 10:32:54.000000000 +0200 @@ -6,14 +6,15 @@ SUBDIRS = WINGs . po Documentation Resou -#libWINGs_la_LDFLAGS = -version-info 1:1:0 +libWINGs_la_LDFLAGS = -version-info 2:1:0 +libWUtil_la_LDFLAGS = -version-info 1:2:0 bin_SCRIPTS = get-wings-flags get-wutil-flags -lib_LIBRARIES = libWINGs.a libWUtil.a +lib_LTLIBRARIES = libWINGs.la libWUtil.la -LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @INTLIBS@ +LDADD= libWUtil.la libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@ EXTRA_DIST = BUGS make-rgb python/Makefile python/README python/WINGs.i \ @@ -21,33 +22,12 @@ EXTRA_DIST = BUGS make-rgb python/Makefi # 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 \ - rgb.h \ selection.c \ - snprintf.c \ - string.c \ - tree.c \ - userdefaults.c \ - usleep.c \ - wapplication.c \ wappresource.c \ wballoon.c \ wbox.c \ @@ -83,8 +63,7 @@ libWINGs_a_SOURCES = \ wview.c \ wwindow.c - -libWUtil_a_SOURCES = \ +libWUtil_la_SOURCES = \ array.c \ bagtree.c \ connection.c \ diff -pruN wmaker-cvs-20060427/WINGs/Tests/Makefile.am wmaker-cvs-20060427-sowings/WINGs/Tests/Makefile.am --- wmaker-cvs-20060427/WINGs/Tests/Makefile.am 2008-04-30 22:45:26.000000000 +0200 +++ wmaker-cvs-20060427-sowings/WINGs/Tests/Makefile.am 2008-06-02 10:29:36.000000000 +0200 @@ -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 -pruN wmaker-cvs-20060427/WPrefs.app/Makefile.am wmaker-cvs-20060427-sowings/WPrefs.app/Makefile.am --- wmaker-cvs-20060427/WPrefs.app/Makefile.am 2008-04-30 22:49:59.000000000 +0200 +++ wmaker-cvs-20060427-sowings/WPrefs.app/Makefile.am 2008-06-02 10:29:36.000000000 +0200 @@ -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 -pruN wmaker-cvs-20060427/configure.ac wmaker-cvs-20060427-sowings/configure.ac --- wmaker-cvs-20060427/configure.ac 2008-04-30 22:49:59.000000000 +0200 +++ wmaker-cvs-20060427-sowings/configure.ac 2008-06-02 10:29:36.000000000 +0200 @@ -974,7 +974,7 @@ cat <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 -pruN wmaker-cvs-20060427/src/Makefile.am wmaker-cvs-20060427-sowings/src/Makefile.am --- wmaker-cvs-20060427/src/Makefile.am 2008-04-30 22:49:59.000000000 +0200 +++ wmaker-cvs-20060427-sowings/src/Makefile.am 2008-06-02 10:29:36.000000000 +0200 @@ -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\ @XLFLAGS@ \ @XFTLIBS@ \ diff -pruN wmaker-cvs-20060427/test/Makefile.am wmaker-cvs-20060427-sowings/test/Makefile.am --- wmaker-cvs-20060427/test/Makefile.am 2008-04-30 22:45:26.000000000 +0200 +++ wmaker-cvs-20060427-sowings/test/Makefile.am 2008-06-02 10:29:36.000000000 +0200 @@ -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 -pruN wmaker-cvs-20060427/util/Makefile.am wmaker-cvs-20060427-sowings/util/Makefile.am --- wmaker-cvs-20060427/util/Makefile.am 2008-04-30 22:49:59.000000000 +0200 +++ wmaker-cvs-20060427-sowings/util/Makefile.am 2008-06-02 10:29:36.000000000 +0200 @@ -16,44 +16,47 @@ INCLUDES = $(DFLAGS) -I$(top_srcdir)/WIN 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 \ @XLFLAGS@ @XLIBS@ @XFTLIBS@ @INTLIBS@ @DLLIBS@ diff -pruN wmaker-cvs-20060427/wmlib/Makefile.am wmaker-cvs-20060427-sowings/wmlib/Makefile.am --- wmaker-cvs-20060427/wmlib/Makefile.am 2008-04-30 22:45:26.000000000 +0200 +++ wmaker-cvs-20060427-sowings/wmlib/Makefile.am 2008-06-02 10:29:36.000000000 +0200 @@ -1,13 +1,14 @@ AUTOMAKE_OPTIONS = no-dependencies -lib_LIBRARIES = libWMaker.a +libWMaker_la_LDFLAGS = -version-info 1:1:0 +lib_LTLIBRARIES = libWMaker.la include_HEADERS = WMaker.h INCLUDES = $(DFLAGS) @XCFLAGS@ -libWMaker_a_SOURCES = \ +libWMaker_la_SOURCES = \ menu.c \ app.c \ event.c \