swc

commit f84dbfae5dacd4981b1bb7d05db791a6f9cb5b73
parent c5c473b88d45a9591c0bd80712ef822ff2813682
Author: Michael Forney <mforney@mforney.org>
Date:   Fri, 13 Sep 2013 00:01:38 -0700

Fix compatibility with automake-1.14

Diffstat:
M
configure.ac
 | 
2
+-
M
libswc/Makefile.am
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@ dnl swc: configure.ac
 AC_PREREQ([2.59])
 
 AC_INIT([swc], [0.0.1], [mforney@mforney.org])
-AM_INIT_AUTOMAKE([foreign -Wall -Werror])
+AM_INIT_AUTOMAKE([foreign -Wall -Werror subdir-objects])
 AC_LANG([C])
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/libswc/Makefile.am b/libswc/Makefile.am
@@ -28,7 +28,7 @@ libswc_la_SOURCES = \
     xkb.c xkb.h \
     drm.c drm.h \
     drm_buffer.c drm_buffer.h \
-    $(PROTOCOL_DIR)/wayland-drm-protocol.c
+    ../protocol/wayland-drm-protocol.c
 
 libswc_la_LIBADD = $(wayland_server_LIBS) $(udev_LIBS) $(xkbcommon_LIBS) \
                    $(drm_LIBS) $(pixman_LIBS) $(wld_LIBS) \