From c1c73c0d0030b6b4a90529a26992893941a10e35 Mon Sep 17 00:00:00 2001 From: Filipe Brandenburger Date: Fri, 1 May 2015 21:28:53 -0700 Subject: build-sys: merge automake subdirs into toplevel This will be required for subdir-objects, otherwise automake will have problems with more than one Makefile.am having rules to build the same files. Tested that it builds and both `make check` and `make distcheck` work. Tested `make install` and compared the tree with the one installed before this commit, both installed the binaries to the same locations. The binaries are also in the same location in the build tree (for instance, ps/pscommand is still there.) Checked the binaries for the correct libraries linked into them. Binary sizes matched before and after this change. Signed-off-by: Filipe Brandenburger --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index af09335..bebea7d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ .deps .libs .version +.dirstamp ABOUT-NLS aclocal.m4 autom4te.cache -- cgit v1.2.1