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

Move cairo-util to shared/

Browse Source
This commit is contained in:
Kristian Høgsberg
2012-05-15 22:33:43 -04:00
parent 5adb480e60
commit 5a315bc72d
10 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/Makefile.am
+1 -3
View File
@@ -57,9 +57,7 @@ noinst_LIBRARIES = libtoytoolkit.a
libtoytoolkit_a_SOURCES = \ libtoytoolkit_a_SOURCES = \
window.c \ window.c \
window.h \ window.h
cairo-util.c \
cairo-util.h
toolkit_libs = \ toolkit_libs = \
libtoytoolkit.a \ libtoytoolkit.a \
clients/desktop-shell.c
+1 -1
View File
@@ -33,8 +33,8 @@
#include <linux/input.h> #include <linux/input.h>
#include <wayland-client.h> #include <wayland-client.h>
#include "cairo-util.h"
#include "window.h" #include "window.h"
#include "../shared/cairo-util.h"
#include "../shared/config-parser.h" #include "../shared/config-parser.h"
#include "desktop-shell-client-protocol.h" #include "desktop-shell-client-protocol.h"
clients/dnd.c
+1 -1
View File
@@ -34,7 +34,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "window.h" #include "window.h"
#include "cairo-util.h" #include "../shared/cairo-util.h"
struct dnd { struct dnd {
struct window *window; struct window *window;
clients/image.c
+1 -1
View File
@@ -35,7 +35,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "window.h" #include "window.h"
#include "cairo-util.h" #include "../shared/cairo-util.h"
struct image { struct image {
struct window *window; struct window *window;
clients/tablet-shell.c
+1 -1
View File
@@ -27,7 +27,7 @@
#include <sys/wait.h> #include <sys/wait.h>
#include "window.h" #include "window.h"
#include "cairo-util.h" #include "../shared/cairo-util.h"
#include "../shared/config-parser.h" #include "../shared/config-parser.h"
#include "tablet-shell-client-protocol.h" #include "tablet-shell-client-protocol.h"
clients/window.c
+1 -1
View File
@@ -59,7 +59,7 @@
#include <linux/input.h> #include <linux/input.h>
#include <wayland-client.h> #include <wayland-client.h>
#include "cairo-util.h" #include "../shared/cairo-util.h"
#include "window.h" #include "window.h"
configure.ac
+6 -4
View File
@@ -109,10 +109,12 @@ PKG_CHECK_MODULES(PNG, [libpng])
PKG_CHECK_MODULES(WEBP, [libwebp], [have_webp=yes], [have_webp=no]) PKG_CHECK_MODULES(WEBP, [libwebp], [have_webp=yes], [have_webp=no])
AS_IF([test "x$have_webp" = "xyes"], AS_IF([test "x$have_webp" = "xyes"],
[AC_DEFINE([HAVE_WEBP], [1], [Have webp])]) [AC_DEFINE([HAVE_WEBP], [1], [Have webp])])
IMAGE_LIBS="$PIXMAN_LIBS $PNG_LIBS $WEBP_LIBS"
IMAGE_CFLAGS="$PIXMAN_CFLAGS $PNG_CFLAGS $WEBP_CFLAGS" PKG_CHECK_MODULES(CAIRO, [cairo])
AC_SUBST(IMAGE_LIBS) SHARED_LIBS="$CAIRO_LIBS $PIXMAN_LIBS $PNG_LIBS $WEBP_LIBS"
AC_SUBST(IMAGE_CFLAGS) SHARED_CFLAGS="$CAIRO_CFLAGS $PIXMAN_CFLAGS $PNG_CFLAGS $WEBP_CFLAGS"
AC_SUBST(SHARED_LIBS)
AC_SUBST(SHARED_CFLAGS)
AC_CHECK_LIB([jpeg], [jpeg_CreateDecompress], have_jpeglib=yes) AC_CHECK_LIB([jpeg], [jpeg_CreateDecompress], have_jpeglib=yes)
if test x$have_jpeglib = xyes; then if test x$have_jpeglib = xyes; then
shared/Makefile.am
+5 -3
View File
@@ -1,5 +1,5 @@
libconfig_parser_la_LIBADD = $(IMAGE_LIBS) libconfig_parser_la_LIBADD = $(SHARED_LIBS)
AM_CPPFLAGS = $(IMAGE_CFLAGS) AM_CPPFLAGS = $(SHARED_CFLAGS)
AM_CFLAGS = $(GCC_CFLAGS) AM_CFLAGS = $(GCC_CFLAGS)
noinst_LTLIBRARIES = libconfig-parser.la noinst_LTLIBRARIES = libconfig-parser.la
@@ -7,4 +7,6 @@ libconfig_parser_la_SOURCES = \
config-parser.c \ config-parser.c \
option-parser.c \ option-parser.c \
image-loader.c \ image-loader.c \
config-parser.h config-parser.h \
cairo-util.c \
cairo-util.h
clients/cairo-util.c → shared/cairo-util.c
View File
clients/cairo-util.h → shared/cairo-util.h
View File