commit d32847c

Michael Forney  ·  2013-09-03 06:24:28 +0000 UTC
parent c3dba11 
Move compositor code to libswc
47 files changed,  +37, -33
M Makefile.am
M configure.ac
A libswc/Makefile.am
R libswc/binding.c
R libswc/binding.h
R libswc/buffer.c
R libswc/buffer.h
R libswc/compositor.c
R libswc/compositor.h
R libswc/data.c
R libswc/data.h
R libswc/data_device.c
R libswc/data_device.h
R libswc/data_device_manager.c
R libswc/data_device_manager.h
R libswc/drm.c
R libswc/drm.h
R libswc/egl.c
R libswc/egl.h
R libswc/evdev_device.c
R libswc/evdev_device.h
R libswc/event.h
R libswc/input_focus.c
R libswc/input_focus.h
R libswc/keyboard.c
R libswc/keyboard.h
R libswc/mode.c
R libswc/mode.h
R libswc/output.c
R libswc/output.h
R libswc/pointer.c
R libswc/pointer.h
R libswc/region.c
R libswc/region.h
R libswc/renderer.c
R libswc/renderer.h
R libswc/seat.c
R libswc/seat.h
R libswc/surface.c
R libswc/surface.h
R libswc/surface_state.h
R libswc/tty.c
R libswc/tty.h
R libswc/util.c
R libswc/util.h
R libswc/xkb.c
R libswc/xkb.h
M Makefile.am
+1, -31 
 1@@ -1,36 +1,6 @@
 2 # swc: Makefile.am
 3 
 4 ACLOCAL_AMFLAGS = -I m4
 5-AM_CFLAGS = $(pixman_CFLAGS) $(drm_CFLAGS) $(intelbatch_CFLAGS)
 6 
 7-lib_LTLIBRARIES = libswc.la
 8-
 9-libswc_la_SOURCES = \
10-    compositor.c compositor.h \
11-    util.c util.h \
12-    output.c output.h \
13-    buffer.c buffer.h \
14-    surface.c surface.h \
15-    region.c region.h \
16-    renderer.c renderer.h \
17-    input_focus.c input_focus.h \
18-    keyboard.c keyboard.h \
19-    pointer.c pointer.h \
20-    seat.c seat.h \
21-    data_device_manager.c data_device_manager.h \
22-    data_device.c data_device.h \
23-    data.c data.h \
24-    mode.c mode.h \
25-    tty.c tty.h \
26-    evdev_device.c evdev_device.h \
27-    xkb.c xkb.h \
28-    drm.c drm.h \
29-    egl.c egl.h
30-
31-libswc_la_LIBADD = $(wayland_server_LIBS) $(udev_LIBS) $(xkbcommon_LIBS) \
32-                   $(drm_LIBS) $(drm_intel_LIBS) $(gbm_LIBS) $(egl_LIBS) \
33-                   $(pixman_LIBS) $(intelbatch_LIBS) \
34-                   launch/liblaunch-protocol.la
35-
36-SUBDIRS = launch
37+SUBDIRS = launch libswc
38
M configure.ac
+2, -2 
 1@@ -14,7 +14,7 @@ AC_USE_SYSTEM_EXTENSIONS
 2 AM_PROG_AR
 3 LT_INIT
 4 
 5-AC_CONFIG_SRCDIR([compositor.c])
 6+AC_CONFIG_SRCDIR([libswc/compositor.c])
 7 AC_CONFIG_MACRO_DIR([m4])
 8 
 9 PKG_PROG_PKG_CONFIG([0.9.0])
10@@ -33,6 +33,6 @@ PKG_CHECK_MODULES([pixman], [pixman-1])
11 PKG_CHECK_MODULES([wayland_client], [wayland-client])
12 dnl }}}
13 
14-AC_CONFIG_FILES([Makefile launch/Makefile])
15+AC_CONFIG_FILES([Makefile libswc/Makefile launch/Makefile])
16 AC_OUTPUT
17
A libswc/Makefile.am
+34, -0 
 1@@ -0,0 +1,34 @@
 2+# swc: libswc/Makefile.am
 3+
 4+AM_CPPFLAGS = -I$(top_srcdir)
 5+AM_CFLAGS = $(pixman_CFLAGS) $(drm_CFLAGS) $(intelbatch_CFLAGS)
 6+
 7+lib_LTLIBRARIES = libswc.la
 8+
 9+libswc_la_SOURCES = \
10+    compositor.c compositor.h \
11+    util.c util.h \
12+    output.c output.h \
13+    buffer.c buffer.h \
14+    surface.c surface.h \
15+    region.c region.h \
16+    renderer.c renderer.h \
17+    input_focus.c input_focus.h \
18+    keyboard.c keyboard.h \
19+    pointer.c pointer.h \
20+    seat.c seat.h \
21+    data_device_manager.c data_device_manager.h \
22+    data_device.c data_device.h \
23+    data.c data.h \
24+    mode.c mode.h \
25+    tty.c tty.h \
26+    evdev_device.c evdev_device.h \
27+    xkb.c xkb.h \
28+    drm.c drm.h \
29+    egl.c egl.h
30+
31+libswc_la_LIBADD = $(wayland_server_LIBS) $(udev_LIBS) $(xkbcommon_LIBS) \
32+                   $(drm_LIBS) $(drm_intel_LIBS) $(gbm_LIBS) $(egl_LIBS) \
33+                   $(pixman_LIBS) $(intelbatch_LIBS) \
34+                   ../launch/liblaunch-protocol.la
35+
R binding.c => libswc/binding.c
+0, -0
R binding.h => libswc/binding.h
+0, -0
R buffer.c => libswc/buffer.c
+0, -0
R buffer.h => libswc/buffer.h
+0, -0
R compositor.c => libswc/compositor.c
+0, -0
R compositor.h => libswc/compositor.h
+0, -0
R data.c => libswc/data.c
+0, -0
R data.h => libswc/data.h
+0, -0
R data_device.c => libswc/data_device.c
+0, -0
R data_device.h => libswc/data_device.h
+0, -0
R data_device_manager.c => libswc/data_device_manager.c
+0, -0
R data_device_manager.h => libswc/data_device_manager.h
+0, -0
R drm.c => libswc/drm.c
+0, -0
R drm.h => libswc/drm.h
+0, -0
R egl.c => libswc/egl.c
+0, -0
R egl.h => libswc/egl.h
+0, -0
R evdev_device.c => libswc/evdev_device.c
+0, -0
R evdev_device.h => libswc/evdev_device.h
+0, -0
R event.h => libswc/event.h
+0, -0
R input_focus.c => libswc/input_focus.c
+0, -0
R input_focus.h => libswc/input_focus.h
+0, -0
R keyboard.c => libswc/keyboard.c
+0, -0
R keyboard.h => libswc/keyboard.h
+0, -0
R mode.c => libswc/mode.c
+0, -0
R mode.h => libswc/mode.h
+0, -0
R output.c => libswc/output.c
+0, -0
R output.h => libswc/output.h
+0, -0
R pointer.c => libswc/pointer.c
+0, -0
R pointer.h => libswc/pointer.h
+0, -0
R region.c => libswc/region.c
+0, -0
R region.h => libswc/region.h
+0, -0
R renderer.c => libswc/renderer.c
+0, -0
R renderer.h => libswc/renderer.h
+0, -0
R seat.c => libswc/seat.c
+0, -0
R seat.h => libswc/seat.h
+0, -0
R surface.c => libswc/surface.c
+0, -0
R surface.h => libswc/surface.h
+0, -0
R surface_state.h => libswc/surface_state.h
+0, -0
R tty.c => libswc/tty.c
+0, -0
R tty.h => libswc/tty.h
+0, -0
R util.c => libswc/util.c
+0, -0
R util.h => libswc/util.h
+0, -0
R xkb.c => libswc/xkb.c
+0, -0
R xkb.h => libswc/xkb.h
+0, -0