Thanks to Gilbert Ashley, now the git repo contains all the patches which were applied to the mercurial tree. He ported Voinov's patch about the WINGs shared library to the git repo, which will land in 'next' soon.
Thanks Gilbert! For reference, here it goes. --8<-- >From b3027c0d2960b37f5ba424917ad9cdc5fb187f32 Mon Sep 17 00:00:00 2001 From: Alexey Voinov <[email protected]> Date: Tue Aug 14 13:33:22 2007 +0400 Subject: [PATCH] WINGs shared library generation This patch modifies the linking of the WINGs libraries to create a shared library. wmaker used to do this, but it was dropped around wmaker-0.90/0.91. The shared .so library is needed when compiling and running the wdm display manager and any other programs which link to libWINGs. Submitted by: Gilbert Ashley Origin: ALT/Sisyphus Linux --- WINGs/Examples/Makefile.am | 17 +++++++++-------- WINGs/Extras/Makefile.am | 7 ++++--- 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 | 5 +++-- 10 files changed, 45 insertions(+), 57 deletions(-) diff --git a/WINGs/Examples/Makefile.am b/WINGs/Examples/Makefile.am index 94305bf..2c91bb9 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 db6d083..4b627d5 100644 --- a/WINGs/Extras/Makefile.am +++ b/WINGs/Extras/Makefile.am @@ -10,7 +10,7 @@ includedir = @includedir@/WINGs include_HEADERS = wtableview.h wtabledelegates.h -lib_LIBRARIES = libExtraWINGs.a +lib_LIBRARIES = libExtraWINGs.la noinst_PROGRAMS = test @@ -18,7 +18,7 @@ EXTRA_DIST = libExtraWINGs_a_AR = $(QUIET_AR) $(AR) $(ARFLAGS) -libExtraWINGs_a_SOURCES = \ +libExtraWINGs_la_SOURCES = \ wtableview.c \ wtabledelegates.c \ wtableview.h \ @@ -29,7 +29,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 --git a/WINGs/Makefile.am b/WINGs/Makefile.am index ba52b08..4234ba4 100644 --- a/WINGs/Makefile.am +++ b/WINGs/Makefile.am @@ -10,14 +10,15 @@ libWINGs_a_AR = $(QUIET_AR) $(AR) $(ARFLAGS) libWUtil_a_AR = $(QUIET_AR) $(AR) $(ARFLAGS) -#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 \ @@ -25,33 +26,12 @@ EXTRA_DIST = BUGS make-rgb 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 \ - rgb.h \ selection.c \ - snprintf.c \ - string.c \ - tree.c \ - userdefaults.c \ - usleep.c \ - wapplication.c \ wappresource.c \ wballoon.c \ wbox.c \ @@ -87,8 +67,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 6b5e52d..c838c22 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 2acf4bd..cf1f044 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 27245de..ea79059 100644 --- a/configure.ac +++ b/configure.ac @@ -987,7 +987,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 fe326c6..1eca725 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\ @XLFLAGS@ \ @XFTLIBS@ \ diff --git a/test/Makefile.am b/test/Makefile.am index a0db7bb..ff19776 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 b597a58..3494334 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 \ @XLFLAGS@ @XLIBS@ @XFTLIBS@ @INTLIBS@ @DLLIBS@ diff --git a/wmlib/Makefile.am b/wmlib/Makefile.am index 84005cd..241f6b1 100644 --- a/wmlib/Makefile.am +++ b/wmlib/Makefile.am @@ -1,7 +1,8 @@ AUTOMAKE_OPTIONS = no-dependencies -lib_LIBRARIES = libWMaker.a +libWMaker_la_LDFLAGS = -version-info 1:1:0 +lib_LTLIBRARIES = libWMaker.la include_HEADERS = WMaker.h @@ -9,7 +10,7 @@ INCLUDES = $(DFLAGS) @XCFLAGS@ libWMaker_a_AR = $(QUIET_AR) $(AR) $(ARFLAGS) -libWMaker_a_SOURCES = \ +libWMaker_la_SOURCES = \ menu.c \ app.c \ event.c \ -- 1.6.5.rc1 -- To unsubscribe, send mail to [email protected].
