system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-07-21 10:44:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

desktop-shell: Move to new desktop-shell subdirectory

Browse source
This commit is contained in:
Kristian Høgsberg 2013-12-03 16:31:10 -08:00
parent 2ba10df300
commit 19d1e6b185
5 changed files with 37 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile.am
View file

@ -10,6 +10,7 @@ SUBDIRS = \
shared \
src \
$(xwayland_subdir) \
desktop-shell \
clients \
data \
protocol \

1
configure.ac
View file

@ -491,6 +491,7 @@ AC_CONFIG_FILES([Makefile
shared/Makefile
src/Makefile
xwayland/Makefile
desktop-shell/Makefile
src/version.h
src/weston.pc
clients/Makefile

35
desktop-shell/Makefile.am Normal file
View file

@ -0,0 +1,35 @@
moduledir = $(libdir)/weston
module_LTLIBRARIES = $(desktop_shell)
AM_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_srcdir)/src \
-DDATADIR='"$(datadir)"' \
-DMODULEDIR='"$(moduledir)"' \
-DLIBEXECDIR='"$(libexecdir)"' \
-DIN_WESTON
if ENABLE_DESKTOP_SHELL
desktop_shell = desktop-shell.la
desktop_shell_la_LDFLAGS = -module -avoid-version
desktop_shell_la_LIBADD = $(COMPOSITOR_LIBS) \
../shared/libshared.la
desktop_shell_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
desktop_shell_la_SOURCES = \
shell.c \
desktop-shell-protocol.c \
desktop-shell-server-protocol.h \
xdg-shell-protocol.c \
xdg-shell-server-protocol.h
endif
BUILT_SOURCES = \
desktop-shell-protocol.c \
desktop-shell-server-protocol.h \
xdg-shell-protocol.c \
xdg-shell-server-protocol.h
CLEANFILES = $(BUILT_SOURCES)
wayland_protocoldir = $(top_srcdir)/protocol
include $(top_srcdir)/wayland-scanner.mk

0
src/shell.c → desktop-shell/shell.c
View file

19
src/Makefile.am
View file

@ -107,7 +107,6 @@ westoninclude_HEADERS = \
moduledir = $(libdir)/weston
module_LTLIBRARIES = \
$(desktop_shell) \
$(cms_static) \
$(cms_colord) \
$(gl_renderer) \
@ -277,20 +276,6 @@ rdp_backend_la_CFLAGS = \
rdp_backend_la_SOURCES = compositor-rdp.c
endif
if ENABLE_DESKTOP_SHELL
desktop_shell = desktop-shell.la
desktop_shell_la_LDFLAGS = -module -avoid-version
desktop_shell_la_LIBADD = $(COMPOSITOR_LIBS) \
../shared/libshared.la
desktop_shell_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
desktop_shell_la_SOURCES = \
shell.c \
desktop-shell-protocol.c \
desktop-shell-server-protocol.h \
xdg-shell-protocol.c \
xdg-shell-server-protocol.h
endif
if HAVE_LCMS
cms_static = cms-static.la
cms_static_la_LDFLAGS = -module -avoid-version
@ -328,16 +313,12 @@ BUILT_SOURCES = \
screenshooter-protocol.c \
text-cursor-position-server-protocol.h \
text-cursor-position-protocol.c \
desktop-shell-protocol.c \
desktop-shell-server-protocol.h \
text-protocol.c \
text-server-protocol.h \
input-method-protocol.c \
input-method-server-protocol.h \
workspaces-server-protocol.h \
workspaces-protocol.c \
xdg-shell-protocol.c \
xdg-shell-server-protocol.h \
git-version.h
CLEANFILES = $(BUILT_SOURCES)