fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-08 13:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

clients: Make libtoytoolkit a libtool library

Browse source 
This way libtool will remember the libtoytoolkit LIBADD libraries.
We can drop the toolkit_libs hack and just link to libtoytoolkit.la and
libtool will add the dependencies.

Conflicts:
	clients/Makefile.am
This commit is contained in:
Kristian Høgsberg 2013-01-28 15:35:03 -05:00
parent cf7c5109a5
commit b4ca478afd
1 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
clients/Makefile.am
View file

@ -71,9 +71,9 @@ endif
screenshooter = weston-screenshooter
noinst_LIBRARIES = libtoytoolkit.a
noinst_LTLIBRARIES = libtoytoolkit.la
libtoytoolkit_a_SOURCES = \
libtoytoolkit_la_SOURCES = \
window.c \
window.h \
text-cursor-position-protocol.c \
@ -81,50 +81,51 @@ libtoytoolkit_a_SOURCES = \
workspaces-protocol.c \
workspaces-client-protocol.h
toolkit_libs = \
libtoytoolkit.a \
../shared/libshared-cairo.la \
$(CLIENT_LIBS) $(CAIRO_EGL_LIBS) -lrt -lm
libtoytoolkit_la_LIBADD = \
$(PIXMAN_LIBS) \
$(CLIENT_LIBS) \
$(CAIRO_EGL_LIBS) \
../shared/libshared-cairo.la -lrt -lm
flower_SOURCES = flower.c
flower_LDADD = $(toolkit_libs)
flower_LDADD = libtoytoolkit.la
weston_screenshooter_SOURCES = \
screenshot.c \
screenshooter-protocol.c \
screenshooter-client-protocol.h
weston_screenshooter_LDADD = $(toolkit_libs)
weston_screenshooter_LDADD = libtoytoolkit.la
weston_terminal_SOURCES = terminal.c
weston_terminal_LDADD = $(toolkit_libs) -lutil
weston_terminal_LDADD = libtoytoolkit.la -lutil
image_SOURCES = image.c
image_LDADD = $(toolkit_libs)
image_LDADD = libtoytoolkit.la
cliptest_SOURCES = cliptest.c
cliptest_CPPFLAGS = $(AM_CPPFLAGS) $(PIXMAN_CFLAGS)
cliptest_LDADD = $(toolkit_libs) $(PIXMAN_LIBS)
cliptest_LDADD = libtoytoolkit.la
dnd_SOURCES = dnd.c
dnd_LDADD = $(toolkit_libs)
dnd_LDADD = libtoytoolkit.la
smoke_SOURCES = smoke.c
smoke_LDADD = $(toolkit_libs)
smoke_LDADD = libtoytoolkit.la
resizor_SOURCES = resizor.c
resizor_LDADD = $(toolkit_libs)
resizor_LDADD = libtoytoolkit.la
eventdemo_SOURCES = eventdemo.c
eventdemo_LDADD = $(toolkit_libs)
eventdemo_LDADD = libtoytoolkit.la
clickdot_SOURCES = clickdot.c
clickdot_LDADD = $(toolkit_libs)
clickdot_LDADD = libtoytoolkit.la
editor_SOURCES = \
editor.c \
text-protocol.c \
text-client-protocol.h
editor_LDADD = $(toolkit_libs)
editor_LDADD = libtoytoolkit.la
keyboard_SOURCES = \
keyboard.c \
@ -132,7 +133,7 @@ keyboard_SOURCES = \
desktop-shell-protocol.c \
input-method-protocol.c \
input-method-client-protocol.h
keyboard_LDADD = $(toolkit_libs)
keyboard_LDADD = libtoytoolkit.la
weston_info_SOURCES = \
weston-info.c \
@ -144,13 +145,13 @@ weston_desktop_shell_SOURCES = \
desktop-shell.c \
desktop-shell-client-protocol.h \
desktop-shell-protocol.c
weston_desktop_shell_LDADD = $(toolkit_libs)
weston_desktop_shell_LDADD = libtoytoolkit.la
weston_tablet_shell_SOURCES = \
tablet-shell.c \
tablet-shell-client-protocol.h \
tablet-shell-protocol.c
weston_tablet_shell_LDADD = $(toolkit_libs)
weston_tablet_shell_LDADD = libtoytoolkit.la
BUILT_SOURCES = \
screenshooter-client-protocol.h \
@ -175,7 +176,7 @@ if BUILD_FULL_GL_CLIENTS
full_gl_client_programs = gears
gears_SOURCES = gears.c
gears_LDADD = $(toolkit_libs)
gears_LDADD = libtoytoolkit.la
if HAVE_GLU
screensaver = weston-screensaver
@ -188,7 +189,7 @@ weston_screensaver_SOURCES = \
wscreensaver-glue.h \
glmatrix.c \
matrix3.xpm
weston_screensaver_LDADD = $(toolkit_libs) $(GLU_LIBS)
weston_screensaver_LDADD = libtoytoolkit.la $(GLU_LIBS)
weston_screensaver_CFLAGS = $(GLU_CFLAGS)
endif
@ -199,6 +200,6 @@ endif
if HAVE_POPPLER
poppler_programs = view
view_SOURCES = view.c
view_LDADD = $(toolkit_libs) $(POPPLER_LIBS)
view_LDADD = libtoytoolkit.la $(POPPLER_LIBS)
view_CPPFLAGS = $(AM_CPPFLAGS) $(POPPLER_CFLAGS)
endif