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

Makefile.am: Move launcher helpers in to libsession-helper.la library

Browse Source
This commit is contained in:
Kristian Høgsberg
2013-11-24 15:10:19 -08:00
parent 02b36f3528
commit 989e9d582c
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile.am
+26 -26
View File
@@ -44,22 +44,27 @@ weston_SOURCES = \
../shared/matrix.c \ ../shared/matrix.c \
../shared/matrix.h \ ../shared/matrix.h \
../shared/zalloc.h \ ../shared/zalloc.h \
weston-launch.h \
weston-egl-ext.h weston-egl-ext.h
if ENABLE_DBUS noinst_LTLIBRARIES = \
weston_SOURCES += \ libsession-helper.la
dbus.h \
dbus.c
weston_CFLAGS += $(DBUS_CFLAGS)
weston_LDADD += $(DBUS_LIBS)
libsession_helper_la_SOURCES = \
weston-launch.h \
launcher-util.c \
launcher-util.h
libsession_helper_la_CFLAGS = $(GCC_CFLAGS) $(LIBDRM_CFLAGS) $(PIXMAN_CFLAGS)
libsession_helper_la_LIBADD = $(LIBDRM_LIBS)
if ENABLE_DBUS
if HAVE_SYSTEMD_LOGIN if HAVE_SYSTEMD_LOGIN
weston_SOURCES += \ libsession_helper_la_SOURCES += \
dbus.h \
dbus.c \
logind-util.h \ logind-util.h \
logind-util.c logind-util.c
weston_CFLAGS += $(SYSTEMD_LOGIN_CFLAGS) libsession_helper_la_CFLAGS += $(SYSTEMD_LOGIN_CFLAGS) $(DBUS_CFLAGS)
weston_LDADD += $(SYSTEMD_LOGIN_LIBS) libsession_helper_la_LIBADD += $(SYSTEMD_LOGIN_LIBS) $(DBUS_LIBS)
endif endif
endif endif
@@ -121,8 +126,6 @@ module_LTLIBRARIES = \
$(fbdev_backend) \ $(fbdev_backend) \
$(rdp_backend) $(rdp_backend)
noinst_LTLIBRARIES =
if INSTALL_RPI_COMPOSITOR if INSTALL_RPI_COMPOSITOR
module_LTLIBRARIES += $(rpi_backend) module_LTLIBRARIES += $(rpi_backend)
else else
@@ -162,8 +165,11 @@ endif
if ENABLE_DRM_COMPOSITOR 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 = \
../shared/libshared.la -lrt $(COMPOSITOR_LIBS) \
$(DRM_COMPOSITOR_LIBS) \
../shared/libshared.la -lrt \
libsession-helper.la
drm_backend_la_CFLAGS = \ drm_backend_la_CFLAGS = \
$(COMPOSITOR_CFLAGS) \ $(COMPOSITOR_CFLAGS) \
$(EGL_CFLAGS) \ $(EGL_CFLAGS) \
@@ -176,8 +182,6 @@ drm_backend_la_SOURCES = \
evdev.c \ evdev.c \
evdev.h \ evdev.h \
evdev-touchpad.c \ evdev-touchpad.c \
launcher-util.c \
launcher-util.h \
libbacklight.c \ libbacklight.c \
libbacklight.h libbacklight.h
@@ -191,7 +195,10 @@ endif
if ENABLE_WAYLAND_COMPOSITOR 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) \
libsession-helper.la \
../shared/libshared-cairo.la ../shared/libshared-cairo.la
wayland_backend_la_CFLAGS = \ wayland_backend_la_CFLAGS = \
$(COMPOSITOR_CFLAGS) \ $(COMPOSITOR_CFLAGS) \
@@ -209,21 +216,17 @@ rpi_backend_la_LDFLAGS = -module -avoid-version
rpi_backend_la_LIBADD = $(COMPOSITOR_LIBS) \ rpi_backend_la_LIBADD = $(COMPOSITOR_LIBS) \
$(RPI_COMPOSITOR_LIBS) \ $(RPI_COMPOSITOR_LIBS) \
$(RPI_BCM_HOST_LIBS) \ $(RPI_BCM_HOST_LIBS) \
$(LIBDRM_LIBS) \
../shared/libshared.la ../shared/libshared.la
rpi_backend_la_CFLAGS = \ rpi_backend_la_CFLAGS = \
$(GCC_CFLAGS) \ $(GCC_CFLAGS) \
$(COMPOSITOR_CFLAGS) \ $(COMPOSITOR_CFLAGS) \
$(RPI_COMPOSITOR_CFLAGS) \ $(RPI_COMPOSITOR_CFLAGS) \
$(LIBDRM_CFLAGS) \
$(RPI_BCM_HOST_CFLAGS) $(RPI_BCM_HOST_CFLAGS)
rpi_backend_la_SOURCES = \ rpi_backend_la_SOURCES = \
compositor-rpi.c \ compositor-rpi.c \
rpi-renderer.c \ rpi-renderer.c \
rpi-renderer.h \ rpi-renderer.h \
rpi-bcm-stubs.h \ rpi-bcm-stubs.h \
launcher-util.c \
launcher-util.h \
evdev.c \ evdev.c \
evdev.h \ evdev.h \
evdev-touchpad.c evdev-touchpad.c
@@ -252,13 +255,12 @@ fbdev_backend_la_LDFLAGS = -module -avoid-version
fbdev_backend_la_LIBADD = \ fbdev_backend_la_LIBADD = \
$(COMPOSITOR_LIBS) \ $(COMPOSITOR_LIBS) \
$(FBDEV_COMPOSITOR_LIBS) \ $(FBDEV_COMPOSITOR_LIBS) \
$(LIBDRM_LIBS) \ libsession-helper.la \
../shared/libshared.la ../shared/libshared.la
fbdev_backend_la_CFLAGS = \ fbdev_backend_la_CFLAGS = \
$(COMPOSITOR_CFLAGS) \ $(COMPOSITOR_CFLAGS) \
$(EGL_CFLAGS) \ $(EGL_CFLAGS) \
$(FBDEV_COMPOSITOR_CFLAGS) \ $(FBDEV_COMPOSITOR_CFLAGS) \
$(LIBDRM_CFLAGS) \
$(PIXMAN_CFLAGS) \ $(PIXMAN_CFLAGS) \
$(GCC_CFLAGS) $(GCC_CFLAGS)
fbdev_backend_la_SOURCES = \ fbdev_backend_la_SOURCES = \
@@ -267,9 +269,7 @@ fbdev_backend_la_SOURCES = \
udev-seat.h \ udev-seat.h \
evdev.c \ evdev.c \
evdev.h \ evdev.h \
evdev-touchpad.c \ evdev-touchpad.c
launcher-util.c \
launcher-util.h
endif endif
if ENABLE_RDP_COMPOSITOR if ENABLE_RDP_COMPOSITOR