The current code assumes the build is done in-tree and sets up -I paths according to that. As such, out-of-tree builds fail. Fix AM_CPPFLAGS to work in either case. No build system should hardcode optimization/pipe flags. So delete that AM_CFLAGS line and let the configure/user build settings work. Finally, EXTRA_DIST should not be conditional. Otherwise, the configure flags will impact the tarball created by `make distcheck`. Signed-off-by: Mike Frysinger <vapier@gentoo.org> --- src/vlock/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vlock/Makefile.am b/src/vlock/Makefile.am index 3f074f4..fa9f5be 100644 --- a/src/vlock/Makefile.am +++ b/src/vlock/Makefile.am @@ -1,9 +1,9 @@ -AM_CPPFLAGS = -I.. -D_GNU_SOURCE -DLOCALEDIR=\"$(localedir)\" -AM_CFLAGS = -pipe -O2 +AM_CPPFLAGS = -I$(srcdir)/.. -I$(builddir)/.. -D_GNU_SOURCE -DLOCALEDIR=\"$(localedir)\" + +EXTRA_DIST = README.vlock if VLOCK bin_PROGRAMS = vlock -EXTRA_DIST = README.vlock endif vlock_SOURCES = \ -- 1.7.12.4
The loadkeys.analyze.c file is listed in EXTRA_DIST, but the header file is not. So it isn't included in the tarball and regenerated. Further, the automake lex targets have issues with parallel builds, so add a fake dependency target to avoid that. Signed-off-by: Mike Frysinger <vapier@gentoo.org> --- src/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 0c420d6..4b5012b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,8 +27,8 @@ dist_bin_SCRIPTS = unicode_start unicode_stop bin_PROGRAMS = $(OLDPROGS) $(PROGS) EXTRA_DIST = \ - loadkeys.analyze.c loadkeys.analyze.l wctomb.c totextmode.c \ - README.cad README.init README.openvt \ + loadkeys.analyze.c loadkeys.analyze.h loadkeys.analyze.l wctomb.c \ + totextmode.c README.cad README.init README.openvt \ cad ALL_S = modifiers.h nls.h paths.h version.h kbd.h @@ -72,6 +72,7 @@ AM_YFLAGS = -d AM_LFLAGS = --header-file=$(CURDIR)/loadkeys.analyze.h BUILT_SOURCES = loadkeys.c loadkeys.analyze.c loadkeys.h loadkeys.analyze.h loadkeys_SOURCES = loadkeys.y loadkeys.analyze.l $(GETFD_S) $(KSYMS_S) $(XMAL_S) $(FIND_S) +loadkeys.analyze.h: loadkeys.analyze.c ; @true install-exec-hook: for i in psfaddtable psfgettable psfstriptable; do \ -- 1.7.12.4
These show up when doing `./configure -C`. Signed-off-by: Mike Frysinger <vapier@gentoo.org> --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ba624ac..2f86825 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ autom4te.cache Makefile.in !po/Makefile.in aclocal.m4 +config.cache config.h config.guess config.status -- 1.7.12.4