diff options
| author | Filipe Brandenburger <filbranden@google.com> | 2015-05-01 21:28:53 -0700 |
|---|---|---|
| committer | Filipe Brandenburger <filbranden@google.com> | 2015-05-01 23:19:31 -0700 |
| commit | c1c73c0d0030b6b4a90529a26992893941a10e35 (patch) | |
| tree | 193aa7fac7e1592f01c866c709687e01aad7c0e4 /configure.ac | |
| parent | 0e7fe5ad241c3ff521e6192b05b71250b3370383 (diff) | |
| download | procps-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 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 051b174..2f804bb 100644 --- a/configure.ac +++ b/configure.ac @@ -274,12 +274,8 @@ AC_CHECK_FUNCS([__fpending alarm atexit dup2 getpagesize gettimeofday iswprint m AC_CONFIG_FILES([Makefile include/Makefile - lib/Makefile - man-po/Makefile - po/Makefile.in - proc/Makefile + man-po/Makefile + po/Makefile.in proc/libprocps.pc - ps/Makefile - testsuite/Makefile - top/Makefile]) + testsuite/Makefile]) AC_OUTPUT |