gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 04:48:06 +01:00
Code Issues Projects Releases Wiki Activity

WINGs shared library generation

Browse Source 
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
This commit is contained in:
Alexey Voinov
2007-08-14 13:33:22 +04:00
committed by Carlos R. Mafra
parent 92eff967a7
commit 3953f53680
10 changed files with 45 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
WINGs/Examples/Makefile.am
View File

@@ -6,23 +6,24 @@ AUTOMAKE_OPTIONS = no-dependencies
noinst_PROGRAMS = connect server fontl puzzle colorpick 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@ @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@ @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@ @NETLIBS@ @INTLIBS@

7
WINGs/Extras/Makefile.am
View File

@@ -10,7 +10,7 @@ includedir = @includedir@/WINGs
include_HEADERS = wtableview.h wtabledelegates.h include_HEADERS = wtableview.h wtabledelegates.h
lib_LIBRARIES = libExtraWINGs.a lib_LTLIBRARIES = libExtraWINGs.la
noinst_PROGRAMS = test noinst_PROGRAMS = test
@@ -18,7 +18,7 @@ EXTRA_DIST =
libExtraWINGs_a_AR = $(QUIET_AR) $(AR) $(ARFLAGS) libExtraWINGs_a_AR = $(QUIET_AR) $(AR) $(ARFLAGS)
libExtraWINGs_a_SOURCES = \ libExtraWINGs_la_SOURCES = \
wtableview.c \ wtableview.c \
wtabledelegates.c \ wtabledelegates.c \
wtableview.h \ wtableview.h \
@@ -29,7 +29,8 @@ AM_CFLAGS = @NOSTRICTALIASING@
INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \ INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG -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@ @XFTLIBS@ @INTLIBS@
test_LDADD = wtableview.o wtabledelegates.o $(LDADD) test_LDADD = wtableview.o wtabledelegates.o $(LDADD)

33
WINGs/Makefile.am
View File

@@ -10,14 +10,15 @@ libWINGs_a_AR = $(QUIET_AR) $(AR) $(ARFLAGS)
libWUtil_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 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 \ 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 # wbutton.c
libWINGs_a_SOURCES = \ libWINGs_la_SOURCES = \
array.c \
bagtree.c \
configuration.c \ configuration.c \
connection.c \
data.c \
dragcommon.c \ dragcommon.c \
dragdestination.c \ dragdestination.c \
dragsource.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 \ selection.c \
snprintf.c \
string.c \
tree.c \
userdefaults.c \
usleep.c \
wapplication.c \
wappresource.c \ wappresource.c \
wballoon.c \ wballoon.c \
wbox.c \ wbox.c \
@@ -87,8 +67,7 @@ libWINGs_a_SOURCES = \
wview.c \ wview.c \
wwindow.c wwindow.c
libWUtil_la_SOURCES = \
libWUtil_a_SOURCES = \
array.c \ array.c \
bagtree.c \ bagtree.c \
connection.c \ connection.c \

5
WINGs/Tests/Makefile.am
View File

@@ -4,13 +4,14 @@ AUTOMAKE_OPTIONS = no-dependencies
noinst_PROGRAMS = wtest wmquery wmfile testmywidget 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@ @XFTLIBS@ @INTLIBS@
testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h 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 EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png

5
WPrefs.app/Makefile.am
View File

@@ -48,10 +48,11 @@ AM_CFLAGS = @NOSTRICTALIASING@
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_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
WPrefs_LDADD = \ WPrefs_LDADD = \
$(top_builddir)/WINGs/libWINGs.a\ $(top_builddir)/WINGs/libWINGs.la\
$(top_builddir)/WINGs/libWUtil.la\
$(top_builddir)/wrlib/libwraster.la \ $(top_builddir)/wrlib/libwraster.la \
@XFTLIBS@ \ @XFTLIBS@ \
@INTLIBS@ @INTLIBS@

2
configure.ac
View File

@@ -987,7 +987,7 @@ cat <<EOF >get-wings-flags
WCFLAGS="$inc_search_path" WCFLAGS="$inc_search_path"
WLFLAGS="$lib_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#" usage="Usage: get-wings-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#"

3
src/Makefile.am
View File

@@ -117,7 +117,8 @@ INCLUDES = \
wmaker_LDADD = \ wmaker_LDADD = \
$(top_builddir)/WINGs/libWINGs.a\ $(top_builddir)/WINGs/libWINGs.la\
$(top_builddir)/WINGs/libWUtil.la\
$(top_builddir)/wrlib/libwraster.la\ $(top_builddir)/wrlib/libwraster.la\
@XLFLAGS@ \ @XLFLAGS@ \
@XFTLIBS@ \ @XFTLIBS@ \

2
test/Makefile.am
View File

@@ -8,7 +8,7 @@ noinst_PROGRAMS = wtest
wtest_SOURCES = wtest.c 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 INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib

23
util/Makefile.am
View File

@@ -16,44 +16,47 @@ INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
liblist= @LIBRARY_SEARCH_PATH@ @INTLIBS@ 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@ wxcopy_LDADD = @XLFLAGS@ @XLIBS@
wxpaste_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 getstyle_SOURCES = getstyle.c fontconv.c
setstyle_LDADD = \ setstyle_LDADD = \
$(top_builddir)/WINGs/libWUtil.a \ $(top_builddir)/WINGs/libWUtil.la \
@XLFLAGS@ @XLIBS@ $(liblist) @XLFLAGS@ @XLIBS@ $(liblist)
setstyle_SOURCES = setstyle.c fontconv.c 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 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 = \ wmagnify_LDADD = \
$(top_builddir)/WINGs/libWINGs.a \ $(top_builddir)/WINGs/libWINGs.la \
$(top_builddir)/WINGs/libWUtil.la \
$(top_builddir)/wrlib/libwraster.la \ $(top_builddir)/wrlib/libwraster.la \
@XFTLIBS@ @INTLIBS@ @DLLIBS@ @XFTLIBS@ @INTLIBS@ @DLLIBS@
wmsetup_LDADD = \ wmsetup_LDADD = \
$(top_builddir)/WINGs/libWINGs.a \ $(top_builddir)/WINGs/libWINGs.la \
$(top_builddir)/WINGs/libWUtil.la \
$(top_builddir)/wrlib/libwraster.la \ $(top_builddir)/wrlib/libwraster.la \
@XFTLIBS@ @INTLIBS@ @DLLIBS@ @XFTLIBS@ @INTLIBS@ @DLLIBS@
wmsetbg_LDADD = \ wmsetbg_LDADD = \
$(top_builddir)/WINGs/libWINGs.a \ $(top_builddir)/WINGs/libWINGs.la \
$(top_builddir)/WINGs/libWUtil.la \
$(top_builddir)/wrlib/libwraster.la \ $(top_builddir)/wrlib/libwraster.la \
@XLFLAGS@ @XLIBS@ @XFTLIBS@ @INTLIBS@ @DLLIBS@ @XLFLAGS@ @XLIBS@ @XFTLIBS@ @INTLIBS@ @DLLIBS@

5
wmlib/Makefile.am
View File

@@ -1,7 +1,8 @@
AUTOMAKE_OPTIONS = no-dependencies AUTOMAKE_OPTIONS = no-dependencies
lib_LIBRARIES = libWMaker.a libWMaker_la_LDFLAGS = -version-info 1:1:0
lib_LTLIBRARIES = libWMaker.la
include_HEADERS = WMaker.h include_HEADERS = WMaker.h
@@ -9,7 +10,7 @@ INCLUDES = $(DFLAGS) @XCFLAGS@
libWMaker_a_AR = $(QUIET_AR) $(AR) $(ARFLAGS) libWMaker_a_AR = $(QUIET_AR) $(AR) $(ARFLAGS)
libWMaker_a_SOURCES = \ libWMaker_la_SOURCES = \
menu.c \ menu.c \
app.c \ app.c \
event.c \ event.c \