commit d32847c2624b37105563e0cb80aac825b0f16780 parent c3dba11b2e624ed062c30263a3eead6a97c954dd Author: Michael Forney <mforney@mforney.org> Date: Mon, 2 Sep 2013 23:24:28 -0700 Move compositor code to libswc Diffstat:
47 files changed, 37 insertions(+), 33 deletions(-)
diff --git a/Makefile.am b/Makefile.am @@ -1,36 +1,6 @@ # swc: Makefile.am ACLOCAL_AMFLAGS = -I m4 -AM_CFLAGS = $(pixman_CFLAGS) $(drm_CFLAGS) $(intelbatch_CFLAGS) -lib_LTLIBRARIES = libswc.la - -libswc_la_SOURCES = \ - compositor.c compositor.h \ - util.c util.h \ - output.c output.h \ - buffer.c buffer.h \ - surface.c surface.h \ - region.c region.h \ - renderer.c renderer.h \ - input_focus.c input_focus.h \ - keyboard.c keyboard.h \ - pointer.c pointer.h \ - seat.c seat.h \ - data_device_manager.c data_device_manager.h \ - data_device.c data_device.h \ - data.c data.h \ - mode.c mode.h \ - tty.c tty.h \ - evdev_device.c evdev_device.h \ - xkb.c xkb.h \ - drm.c drm.h \ - egl.c egl.h - -libswc_la_LIBADD = $(wayland_server_LIBS) $(udev_LIBS) $(xkbcommon_LIBS) \ - $(drm_LIBS) $(drm_intel_LIBS) $(gbm_LIBS) $(egl_LIBS) \ - $(pixman_LIBS) $(intelbatch_LIBS) \ - launch/liblaunch-protocol.la - -SUBDIRS = launch +SUBDIRS = launch libswc diff --git a/configure.ac b/configure.ac @@ -14,7 +14,7 @@ AC_USE_SYSTEM_EXTENSIONS AM_PROG_AR LT_INIT -AC_CONFIG_SRCDIR([compositor.c]) +AC_CONFIG_SRCDIR([libswc/compositor.c]) AC_CONFIG_MACRO_DIR([m4]) PKG_PROG_PKG_CONFIG([0.9.0]) @@ -33,6 +33,6 @@ PKG_CHECK_MODULES([pixman], [pixman-1]) PKG_CHECK_MODULES([wayland_client], [wayland-client]) dnl }}} -AC_CONFIG_FILES([Makefile launch/Makefile]) +AC_CONFIG_FILES([Makefile libswc/Makefile launch/Makefile]) AC_OUTPUT diff --git a/libswc/Makefile.am b/libswc/Makefile.am @@ -0,0 +1,34 @@ +# swc: libswc/Makefile.am + +AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = $(pixman_CFLAGS) $(drm_CFLAGS) $(intelbatch_CFLAGS) + +lib_LTLIBRARIES = libswc.la + +libswc_la_SOURCES = \ + compositor.c compositor.h \ + util.c util.h \ + output.c output.h \ + buffer.c buffer.h \ + surface.c surface.h \ + region.c region.h \ + renderer.c renderer.h \ + input_focus.c input_focus.h \ + keyboard.c keyboard.h \ + pointer.c pointer.h \ + seat.c seat.h \ + data_device_manager.c data_device_manager.h \ + data_device.c data_device.h \ + data.c data.h \ + mode.c mode.h \ + tty.c tty.h \ + evdev_device.c evdev_device.h \ + xkb.c xkb.h \ + drm.c drm.h \ + egl.c egl.h + +libswc_la_LIBADD = $(wayland_server_LIBS) $(udev_LIBS) $(xkbcommon_LIBS) \ + $(drm_LIBS) $(drm_intel_LIBS) $(gbm_LIBS) $(egl_LIBS) \ + $(pixman_LIBS) $(intelbatch_LIBS) \ + ../launch/liblaunch-protocol.la + diff --git a/binding.c b/libswc/binding.c diff --git a/binding.h b/libswc/binding.h diff --git a/buffer.c b/libswc/buffer.c diff --git a/buffer.h b/libswc/buffer.h diff --git a/compositor.c b/libswc/compositor.c diff --git a/compositor.h b/libswc/compositor.h diff --git a/data.c b/libswc/data.c diff --git a/data.h b/libswc/data.h diff --git a/data_device.c b/libswc/data_device.c diff --git a/data_device.h b/libswc/data_device.h diff --git a/data_device_manager.c b/libswc/data_device_manager.c diff --git a/data_device_manager.h b/libswc/data_device_manager.h diff --git a/drm.c b/libswc/drm.c diff --git a/drm.h b/libswc/drm.h diff --git a/egl.c b/libswc/egl.c diff --git a/egl.h b/libswc/egl.h diff --git a/evdev_device.c b/libswc/evdev_device.c diff --git a/evdev_device.h b/libswc/evdev_device.h diff --git a/event.h b/libswc/event.h diff --git a/input_focus.c b/libswc/input_focus.c diff --git a/input_focus.h b/libswc/input_focus.h diff --git a/keyboard.c b/libswc/keyboard.c diff --git a/keyboard.h b/libswc/keyboard.h diff --git a/mode.c b/libswc/mode.c diff --git a/mode.h b/libswc/mode.h diff --git a/output.c b/libswc/output.c diff --git a/output.h b/libswc/output.h diff --git a/pointer.c b/libswc/pointer.c diff --git a/pointer.h b/libswc/pointer.h diff --git a/region.c b/libswc/region.c diff --git a/region.h b/libswc/region.h diff --git a/renderer.c b/libswc/renderer.c diff --git a/renderer.h b/libswc/renderer.h diff --git a/seat.c b/libswc/seat.c diff --git a/seat.h b/libswc/seat.h diff --git a/surface.c b/libswc/surface.c diff --git a/surface.h b/libswc/surface.h diff --git a/surface_state.h b/libswc/surface_state.h diff --git a/tty.c b/libswc/tty.c diff --git a/tty.h b/libswc/tty.h diff --git a/util.c b/libswc/util.c diff --git a/util.h b/libswc/util.h diff --git a/xkb.c b/libswc/xkb.c diff --git a/xkb.h b/libswc/xkb.h