diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2014-03-06 23:15:02 -0800 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2014-03-06 23:15:02 -0800 |
| commit | 267b28887dffa47eeb79bb4d6e737979b6fc3cc3 (patch) | |
| tree | 4fbbff3fc57ac1941ab6e7087370e4526338dbf1 | |
| parent | bb5344ee6d404095ddb70195b0b4f749d460d989 (diff) | |
build: Move cursor Makefile.am into toplevel Makefile.am
| -rw-r--r-- | Makefile.am | 24 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | cursor/Makefile.am | 21 |
3 files changed, 24 insertions, 24 deletions
diff --git a/Makefile.am b/Makefile.am index f6ee810..f171168 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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)\" diff --git a/configure.ac b/configure.ac index d75dc09..9b7e342 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/cursor/Makefile.am b/cursor/Makefile.am deleted file mode 100644 index 61029b5..0000000 --- a/cursor/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -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)\" |