build: Move cursor Makefile.am into toplevel Makefile.am

parent bb5344ee
......@@ -2,7 +2,7 @@ if BUILD_DOCS
doc_subdir = doc
endif
SUBDIRS = src $(doc_subdir) tests cursor
SUBDIRS = src $(doc_subdir) tests
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
......@@ -13,3 +13,25 @@ dist_pkgdata_DATA = \
wayland-scanner.mk \
protocol/wayland.xml \
protocol/wayland.dtd
lib_LTLIBRARIES = libwayland-cursor.la
include_HEADERS = cursor/wayland-cursor.h
libwayland_cursor_la_SOURCES = \
cursor/wayland-cursor.c \
cursor/os-compatibility.c \
cursor/os-compatibility.h \
cursor/cursor-data.h \
cursor/xcursor.c \
cursor/xcursor.h
libwayland_cursor_la_LIBADD = src/libwayland-client.la
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = cursor/wayland-cursor.pc
libwayland_cursor_la_CFLAGS = \
$(GCC_CFLAGS) \
-I$(top_builddir)/src \
-I$(top_srcdir)/src \
-DICONDIR=\"$(ICONDIR)\"
......@@ -20,7 +20,7 @@ AC_SUBST([WAYLAND_VERSION], [wayland_version])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz subdir-objects])
AM_SILENT_RULES([yes])
......@@ -127,7 +127,6 @@ fi
AM_CONDITIONAL([HAVE_PUBLICAN], [test "x$PUBLICAN" != "x"])
AC_CONFIG_FILES([Makefile
cursor/Makefile
cursor/wayland-cursor.pc
cursor/wayland-cursor-uninstalled.pc
doc/Makefile
......
lib_LTLIBRARIES = libwayland-cursor.la
include_HEADERS = wayland-cursor.h
libwayland_cursor_la_SOURCES = \
wayland-cursor.c \
os-compatibility.c \
os-compatibility.h \
cursor-data.h \
xcursor.c \
xcursor.h
libwayland_cursor_la_LIBADD = $(top_builddir)/src/libwayland-client.la
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = wayland-cursor.pc
AM_CFLAGS = \
$(GCC_CFLAGS) \
-I$(top_builddir)/src \
-I$(top_srcdir)/src \
-DICONDIR=\"$(ICONDIR)\"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment