Fix include paths and distclean https://github.com/mej/libast/issues/2 https://github.com/mej/libast/commit/c6a008f51b38014e7620937bd13ca312dfdeeed5 --- Makefile.am.orig +++ Makefile.am @@ -10,6 +10,7 @@ macrodir = $(datadir)/aclocal EXTRA_DIST = DESIGN LICENSE README $(MACROS) libast.spec MAINTAINERCLEANFILES = Makefile.in *~ aclocal.m4 config.guess config.sub configure depcomp \ install-sh ltconfig ltmain.sh missing mkinstalldirs stamp-h* *.log config.h.in +DISTCLEANFILES = Makefile test: all cd test && $(MAKE) test --- include/Makefile.am.orig +++ include/Makefile.am @@ -7,7 +7,7 @@ nobase_include_HEADERS = libast.h libast/array.h libast/avl_tree.h \ libast/thread_if.h libast/tok.h libast/url.h libast/ustr.h \ libast/vector_if.h -nodist_include_HEADERS = libast/sysdefs.h libast/types.h +nobase_nodist_include_HEADERS = libast/sysdefs.h libast/types.h noinst_HEADERS = libast_internal.h libast/types.h: libast/types.h.in @@ -17,4 +17,4 @@ libast/sysdefs.h: libast/sysdefs.h.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ MAINTAINERCLEANFILES = Makefile.in -DISTCLEANFILES = libast/sysdefs.h libast/types.h +DISTCLEANFILES = Makefile libast/sysdefs.h libast/types.h --- src/Makefile.am.orig +++ src/Makefile.am @@ -2,7 +2,7 @@ lib_LTLIBRARIES = libast.la -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/include/$(PACKAGE) +AM_CPPFLAGS = -I../include -I$(top_srcdir)/include -I$(top_srcdir)/include/$(PACKAGE) AM_CFLAGS = $(PTHREAD_CFLAGS) AM_LDFLAGS = $(PTHREAD_LIBS) @@ -13,3 +13,4 @@ snprintf.c tok.c url.c ustr.c libast_la_LDFLAGS = -version-info 2:2:0 MAINTAINERCLEANFILES = Makefile.in +DISTCLEANFILES = Makefile --- test/Makefile.am.orig +++ test/Makefile.am @@ -1,6 +1,6 @@ EXTRA_PROGRAMS = libast-test libast-perf -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/include/$(PACKAGE) +AM_CPPFLAGS = -I../include -I$(top_srcdir)/include -I$(top_srcdir)/include/$(PACKAGE) libast_test_SOURCES = test.c test.h libast_test_DEPENDENCIES = $(top_builddir)/src/libast.la @@ -20,3 +20,4 @@ perf: libast-perf .PHONY: test MAINTAINERCLEANFILES = Makefile.in +DISTCLEANFILES = Makefile