mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename libconfig-parser to libshared 

Still a bad name.
This commit is contained in:
Kristian Høgsberg 2012-05-15 22:37:26 -04:00
parent 5a315bc72d
commit 20d0028a56
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clients/Makefile.am
View File

@ -61,7 +61,7 @@ libtoytoolkit_a_SOURCES = \
toolkit_libs = \
libtoytoolkit.a \
../shared/libconfig-parser.la \
../shared/libshared.la \
$(CLIENT_LIBS) $(CAIRO_EGL_LIBS) -lrt -lm
flower_SOURCES = flower.c
@ -95,15 +95,13 @@ weston_desktop_shell_SOURCES = \
desktop-shell.c \
desktop-shell-client-protocol.h \
desktop-shell-protocol.c
weston_desktop_shell_LDADD = $(toolkit_libs) \
../shared/libconfig-parser.la
weston_desktop_shell_LDADD = $(toolkit_libs)
weston_tablet_shell_SOURCES = \
tablet-shell.c \
tablet-shell-client-protocol.h \
tablet-shell-protocol.c
weston_tablet_shell_LDADD = $(toolkit_libs) \
../shared/libconfig-parser.la
weston_tablet_shell_LDADD = $(toolkit_libs)
BUILT_SOURCES = \
screenshooter-client-protocol.h \

7
shared/Makefile.am
View File

@ -1,9 +1,10 @@
libconfig_parser_la_LIBADD = $(SHARED_LIBS)
noinst_LTLIBRARIES = libshared.la
libshared_la_LIBADD = $(SHARED_LIBS)
AM_CPPFLAGS = $(SHARED_CFLAGS)
AM_CFLAGS = $(GCC_CFLAGS)
noinst_LTLIBRARIES = libconfig-parser.la
libconfig_parser_la_SOURCES = \
libshared_la_SOURCES = \
config-parser.c \
option-parser.c \
image-loader.c \

10
src/Makefile.am
View File

@ -11,7 +11,7 @@ AM_CPPFLAGS = \
weston_LDFLAGS = -export-dynamic
weston_CFLAGS = $(GCC_CFLAGS)
weston_LDADD = \
$(COMPOSITOR_LIBS) $(DLOPEN_LIBS) -lm ../shared/libconfig-parser.la
$(COMPOSITOR_LIBS) $(DLOPEN_LIBS) -lm ../shared/libshared.la
weston_SOURCES = \
compositor.c \
@ -63,7 +63,7 @@ if ENABLE_X11_COMPOSITOR
x11_backend = x11-backend.la
x11_backend_la_LDFLAGS = -module -avoid-version
x11_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(X11_COMPOSITOR_LIBS) \
../shared/libconfig-parser.la
../shared/libshared.la
x11_backend_la_CFLAGS = $(X11_COMPOSITOR_CFLAGS) $(GCC_CFLAGS)
x11_backend_la_SOURCES = compositor-x11.c
endif
@ -72,7 +72,7 @@ if ENABLE_DRM_COMPOSITOR
drm_backend = drm-backend.la
drm_backend_la_LDFLAGS = -module -avoid-version
drm_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(DRM_COMPOSITOR_LIBS) \
../shared/libconfig-parser.la
../shared/libshared.la
drm_backend_la_CFLAGS = $(DRM_COMPOSITOR_CFLAGS) $(GCC_CFLAGS)
drm_backend_la_SOURCES = \
compositor-drm.c \
@ -89,7 +89,7 @@ if ENABLE_WAYLAND_COMPOSITOR
wayland_backend = wayland-backend.la
wayland_backend_la_LDFLAGS = -module -avoid-version
wayland_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(WAYLAND_COMPOSITOR_LIBS) \
../shared/libconfig-parser.la
../shared/libshared.la
wayland_backend_la_CFLAGS = $(WAYLAND_COMPOSITOR_CFLAGS) $(GCC_CFLAGS)
wayland_backend_la_SOURCES = compositor-wayland.c
endif
@ -119,7 +119,7 @@ if ENABLE_DESKTOP_SHELL
desktop_shell = desktop-shell.la
desktop_shell_la_LDFLAGS = -module -avoid-version
desktop_shell_la_LIBADD = $(COMPOSITOR_LIBS) \
../shared/libconfig-parser.la
../shared/libshared.la
desktop_shell_la_CFLAGS = $(GCC_CFLAGS)
desktop_shell_la_SOURCES = \
shell.c \