mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename libconfig-parser to libshared

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
clients/Makefile.am
+3 -5
View File
@@ -61,7 +61,7 @@ libtoytoolkit_a_SOURCES = \
toolkit_libs = \ toolkit_libs = \
libtoytoolkit.a \ libtoytoolkit.a \
../shared/libconfig-parser.la \ ../shared/libshared.la \
$(CLIENT_LIBS) $(CAIRO_EGL_LIBS) -lrt -lm $(CLIENT_LIBS) $(CAIRO_EGL_LIBS) -lrt -lm
flower_SOURCES = flower.c flower_SOURCES = flower.c
@@ -95,15 +95,13 @@ weston_desktop_shell_SOURCES = \
desktop-shell.c \ desktop-shell.c \
desktop-shell-client-protocol.h \ desktop-shell-client-protocol.h \
desktop-shell-protocol.c desktop-shell-protocol.c
weston_desktop_shell_LDADD = $(toolkit_libs) \ weston_desktop_shell_LDADD = $(toolkit_libs)
../shared/libconfig-parser.la
weston_tablet_shell_SOURCES = \ weston_tablet_shell_SOURCES = \
tablet-shell.c \ tablet-shell.c \
tablet-shell-client-protocol.h \ tablet-shell-client-protocol.h \
tablet-shell-protocol.c tablet-shell-protocol.c
weston_tablet_shell_LDADD = $(toolkit_libs) \ weston_tablet_shell_LDADD = $(toolkit_libs)
../shared/libconfig-parser.la
BUILT_SOURCES = \ BUILT_SOURCES = \
screenshooter-client-protocol.h \ screenshooter-client-protocol.h \
shared/Makefile.am
+4 -3
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_CPPFLAGS = $(SHARED_CFLAGS)
AM_CFLAGS = $(GCC_CFLAGS) AM_CFLAGS = $(GCC_CFLAGS)
noinst_LTLIBRARIES = libconfig-parser.la libshared_la_SOURCES = \
libconfig_parser_la_SOURCES = \
config-parser.c \ config-parser.c \
option-parser.c \ option-parser.c \
image-loader.c \ image-loader.c \
src/Makefile.am
+5 -5
View File
@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
weston_LDFLAGS = -export-dynamic weston_LDFLAGS = -export-dynamic
weston_CFLAGS = $(GCC_CFLAGS) weston_CFLAGS = $(GCC_CFLAGS)
weston_LDADD = \ weston_LDADD = \
$(COMPOSITOR_LIBS) $(DLOPEN_LIBS) -lm ../shared/libconfig-parser.la $(COMPOSITOR_LIBS) $(DLOPEN_LIBS) -lm ../shared/libshared.la
weston_SOURCES = \ weston_SOURCES = \
compositor.c \ compositor.c \
@@ -63,7 +63,7 @@ if ENABLE_X11_COMPOSITOR
x11_backend = x11-backend.la x11_backend = x11-backend.la
x11_backend_la_LDFLAGS = -module -avoid-version x11_backend_la_LDFLAGS = -module -avoid-version
x11_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(X11_COMPOSITOR_LIBS) \ 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_CFLAGS = $(X11_COMPOSITOR_CFLAGS) $(GCC_CFLAGS)
x11_backend_la_SOURCES = compositor-x11.c x11_backend_la_SOURCES = compositor-x11.c
endif endif
@@ -72,7 +72,7 @@ if ENABLE_DRM_COMPOSITOR
drm_backend = drm-backend.la drm_backend = drm-backend.la
drm_backend_la_LDFLAGS = -module -avoid-version drm_backend_la_LDFLAGS = -module -avoid-version
drm_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(DRM_COMPOSITOR_LIBS) \ 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_CFLAGS = $(DRM_COMPOSITOR_CFLAGS) $(GCC_CFLAGS)
drm_backend_la_SOURCES = \ drm_backend_la_SOURCES = \
compositor-drm.c \ compositor-drm.c \
@@ -89,7 +89,7 @@ if ENABLE_WAYLAND_COMPOSITOR
wayland_backend = wayland-backend.la wayland_backend = wayland-backend.la
wayland_backend_la_LDFLAGS = -module -avoid-version wayland_backend_la_LDFLAGS = -module -avoid-version
wayland_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(WAYLAND_COMPOSITOR_LIBS) \ 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_CFLAGS = $(WAYLAND_COMPOSITOR_CFLAGS) $(GCC_CFLAGS)
wayland_backend_la_SOURCES = compositor-wayland.c wayland_backend_la_SOURCES = compositor-wayland.c
endif endif
@@ -119,7 +119,7 @@ if ENABLE_DESKTOP_SHELL
desktop_shell = desktop-shell.la desktop_shell = desktop-shell.la
desktop_shell_la_LDFLAGS = -module -avoid-version desktop_shell_la_LDFLAGS = -module -avoid-version
desktop_shell_la_LIBADD = $(COMPOSITOR_LIBS) \ desktop_shell_la_LIBADD = $(COMPOSITOR_LIBS) \
../shared/libconfig-parser.la ../shared/libshared.la
desktop_shell_la_CFLAGS = $(GCC_CFLAGS) desktop_shell_la_CFLAGS = $(GCC_CFLAGS)
desktop_shell_la_SOURCES = \ desktop_shell_la_SOURCES = \
shell.c \ shell.c \