Fix distcheck with non-recursive Makefiles

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

diff --git a/Makefile.am b/Makefile.am
index bc29464..2bc6a35 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,11 @@ ChangeLog:
 
 dist-hook: ChangeLog INSTALL
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src \
+       -I$(top_srcdir)/src/xkbcomp \
+       -Isrc/xkbcomp
 AM_CFLAGS = \
        $(X11_CFLAGS) \
        $(XORG_COMPILER_FLAGS) \
@@ -72,11 +76,14 @@ libxkbcommon_la_SOURCES = \
        src/xkballoc.h \
        src/xkbmisc.h \
        src/xkbrules.h \
-       src/XKBcommonint.h \
-       include/xkbcommon/xkbcommon.h
+       src/XKBcommonint.h
 
-BUILT_SOURCES = src/xkbcomp/xkbparse.h src/ks_tables.h
-CLEANFILES = src/ks_tables.h
+BUILT_SOURCES = \
+       src/xkbcomp/xkbparse.c \
+       src/xkbcomp/xkbparse.h \
+       src/xkbcomp/xkbscan.c \
+       src/ks_tables.h
+CLEANFILES = $(BUILT_SOURCES)
 
 noinst_PROGRAMS = makekeys/makekeys
 makekeys_makekeys_SOURCES = makekeys/makekeys.c

diff --git a/test/Makefile.am b/test/Makefile.am
index 1f9d537..fb4e3e6 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -12,7 +12,6 @@ EXTRA_DIST =          \
        bad.xkb         \
        basic.xkb       \
        default.xkb     \
-       named.xkb       \
        comprehensive-plus-geom.xkb
 
 clean-local: