summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Jennings <mej@lanl.gov>2020-02-28 15:30:29 -0700
committerMichael Jennings <mej@lanl.gov>2020-02-28 15:30:29 -0700
commitc6a008f51b38014e7620937bd13ca312dfdeeed5 (patch)
tree6c72b15631210c295f23015ba5767ba1de6768ad
parent512b8e8b83407bb0ceed93b2a824252ebac4ff6b (diff)
*/Makefile.am: Fix include paths and `distclean`
-rw-r--r--Makefile.am1
-rw-r--r--include/Makefile.am4
-rw-r--r--src/Makefile.am3
-rw-r--r--test/Makefile.am3
4 files changed, 7 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index f0bed9b..f5d5ab3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,7 @@ macrodir = $(datadir)/aclocal
10EXTRA_DIST = DESIGN LICENSE README $(MACROS) libast.spec 10EXTRA_DIST = DESIGN LICENSE README $(MACROS) libast.spec
11MAINTAINERCLEANFILES = Makefile.in *~ aclocal.m4 config.guess config.sub configure depcomp \ 11MAINTAINERCLEANFILES = Makefile.in *~ aclocal.m4 config.guess config.sub configure depcomp \
12 install-sh ltconfig ltmain.sh missing mkinstalldirs stamp-h* *.log config.h.in 12 install-sh ltconfig ltmain.sh missing mkinstalldirs stamp-h* *.log config.h.in
13DISTCLEANFILES = Makefile
13 14
14test: all 15test: all
15 cd test && $(MAKE) test 16 cd test && $(MAKE) test
diff --git a/include/Makefile.am b/include/Makefile.am
index 3fcaa9e..468c187 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -7,7 +7,7 @@ nobase_include_HEADERS = libast.h libast/array.h libast/avl_tree.h \
7 libast/thread_if.h libast/tok.h libast/url.h libast/ustr.h \ 7 libast/thread_if.h libast/tok.h libast/url.h libast/ustr.h \
8 libast/vector_if.h 8 libast/vector_if.h
9 9
10nodist_include_HEADERS = libast/sysdefs.h libast/types.h 10nobase_nodist_include_HEADERS = libast/sysdefs.h libast/types.h
11noinst_HEADERS = libast_internal.h 11noinst_HEADERS = libast_internal.h
12 12
13libast/types.h: libast/types.h.in 13libast/types.h: libast/types.h.in
@@ -17,4 +17,4 @@ libast/sysdefs.h: libast/sysdefs.h.in
17 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ 17 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
18 18
19MAINTAINERCLEANFILES = Makefile.in 19MAINTAINERCLEANFILES = Makefile.in
20DISTCLEANFILES = libast/sysdefs.h libast/types.h 20DISTCLEANFILES = Makefile libast/sysdefs.h libast/types.h
diff --git a/src/Makefile.am b/src/Makefile.am
index c8ecfaf..4db1fb1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
2 2
3lib_LTLIBRARIES = libast.la 3lib_LTLIBRARIES = libast.la
4 4
5INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/include/$(PACKAGE) 5AM_CPPFLAGS = -I../include -I$(top_srcdir)/include -I$(top_srcdir)/include/$(PACKAGE)
6AM_CFLAGS = $(PTHREAD_CFLAGS) 6AM_CFLAGS = $(PTHREAD_CFLAGS)
7AM_LDFLAGS = $(PTHREAD_LIBS) 7AM_LDFLAGS = $(PTHREAD_LIBS)
8 8
@@ -13,3 +13,4 @@ snprintf.c tok.c url.c ustr.c
13 13
14libast_la_LDFLAGS = -version-info 2:2:0 14libast_la_LDFLAGS = -version-info 2:2:0
15MAINTAINERCLEANFILES = Makefile.in 15MAINTAINERCLEANFILES = Makefile.in
16DISTCLEANFILES = Makefile
diff --git a/test/Makefile.am b/test/Makefile.am
index 2fcf71d..624083e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,6 +1,6 @@
1EXTRA_PROGRAMS = libast-test libast-perf 1EXTRA_PROGRAMS = libast-test libast-perf
2 2
3INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/include/$(PACKAGE) 3AM_CPPFLAGS = -I../include -I$(top_srcdir)/include -I$(top_srcdir)/include/$(PACKAGE)
4 4
5libast_test_SOURCES = test.c test.h 5libast_test_SOURCES = test.c test.h
6libast_test_DEPENDENCIES = $(top_builddir)/src/libast.la 6libast_test_DEPENDENCIES = $(top_builddir)/src/libast.la
@@ -20,3 +20,4 @@ perf: libast-perf
20 20
21.PHONY: test 21.PHONY: test
22MAINTAINERCLEANFILES = Makefile.in 22MAINTAINERCLEANFILES = Makefile.in
23DISTCLEANFILES = Makefile