configure.ac: Don't link weston to cairo or image libraries
We were pulling in cairo and the image loading libraries through libshared. Split out libshared into a core libshared and a libshared-cairo that pulls in the extra libraries.
This commit is contained in:
+21
-6
@@ -1,15 +1,30 @@
|
||||
noinst_LTLIBRARIES = libshared.la
|
||||
noinst_LTLIBRARIES = libshared.la libshared-cairo.la
|
||||
|
||||
libshared_la_LIBADD = $(SHARED_LIBS)
|
||||
AM_CPPFLAGS = $(SHARED_CFLAGS)
|
||||
AM_CFLAGS = $(GCC_CFLAGS)
|
||||
libshared_la_CFLAGS = $(GCC_CFLAGS)
|
||||
|
||||
libshared_la_SOURCES = \
|
||||
config-parser.c \
|
||||
option-parser.c \
|
||||
image-loader.c \
|
||||
config-parser.h \
|
||||
os-compatibility.c \
|
||||
os-compatibility.h \
|
||||
os-compatibility.h
|
||||
|
||||
libshared_cairo_la_CFLAGS = \
|
||||
$(GCC_CFLAGS) \
|
||||
$(PIXMAN_CFLAGS) \
|
||||
$(CAIRO_CFLAGS) \
|
||||
$(PNG_CFLAGS) \
|
||||
$(WEBP_CFLAGS)
|
||||
|
||||
libshared_cairo_la_LIBADD = \
|
||||
$(PIXMAN_LIBS) \
|
||||
$(CAIRO_LIBS) \
|
||||
$(PNG_LIBS) \
|
||||
$(WEBP_LIBS) \
|
||||
$(JPEG_LIBS)
|
||||
|
||||
libshared_cairo_la_SOURCES = \
|
||||
$(libshared_la_SOURCES) \
|
||||
image-loader.c \
|
||||
cairo-util.c \
|
||||
cairo-util.h
|
||||
|
||||
@@ -23,6 +23,8 @@
|
||||
#ifndef _CAIRO_UTIL_H
|
||||
#define _CAIRO_UTIL_H
|
||||
|
||||
#include <pixman.h>
|
||||
|
||||
void
|
||||
surface_flush_device(cairo_surface_t *surface);
|
||||
|
||||
@@ -87,4 +89,7 @@ enum theme_location {
|
||||
enum theme_location
|
||||
theme_get_location(struct theme *t, int x, int y, int width, int height, int flags);
|
||||
|
||||
pixman_image_t *
|
||||
load_image(const char *filename);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -23,8 +23,6 @@
|
||||
#ifndef CONFIGPARSER_H
|
||||
#define CONFIGPARSER_H
|
||||
|
||||
#include <pixman.h>
|
||||
|
||||
enum config_key_type {
|
||||
CONFIG_KEY_INTEGER, /* typeof data = int */
|
||||
CONFIG_KEY_UNSIGNED_INTEGER, /* typeof data = unsigned int */
|
||||
@@ -71,8 +69,5 @@ int
|
||||
parse_options(const struct weston_option *options,
|
||||
int count, int argc, char *argv[]);
|
||||
|
||||
pixman_image_t *
|
||||
load_image(const char *filename);
|
||||
|
||||
#endif /* CONFIGPARSER_H */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user