summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorFilipe Brandenburger <filbranden@google.com>2015-05-01 21:28:53 -0700
committerFilipe Brandenburger <filbranden@google.com>2015-05-01 23:19:31 -0700
commitc1c73c0d0030b6b4a90529a26992893941a10e35 (patch)
tree193aa7fac7e1592f01c866c709687e01aad7c0e4 /.gitignore
parent0e7fe5ad241c3ff521e6192b05b71250b3370383 (diff)
downloadprocps-ng-c1c73c0d0030b6b4a90529a26992893941a10e35.tar.gz
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 <filbranden@google.com>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
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