build-sys: drop unneeded $(top_srcdir) from source paths
This is cleaner and we need to match paths exactly when we enable the subdir-objects automake option. Out-of-tree builds still work since automake is smart to know these are source files and that it needs to look for them in $(top_srcdir), so there is no need to make this explicit. Tested that it builds and both `make check` and `make distcheck` work. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
This commit is contained in:
parent
b56fd9d358
commit
0e7fe5ad24
32
Makefile.am
32
Makefile.am
@ -60,7 +60,7 @@ EXTRA_DIST = \
|
||||
if BUILD_PIDOF
|
||||
usrbin_exec_PROGRAMS += pidof
|
||||
dist_man_MANS += pidof.1
|
||||
pidof_SOURCES = pidof.c $(top_srcdir)/lib/fileutils.c
|
||||
pidof_SOURCES = pidof.c lib/fileutils.c
|
||||
else
|
||||
EXTRA_DIST += pidof.1
|
||||
endif
|
||||
@ -68,7 +68,7 @@ endif
|
||||
if BUILD_KILL
|
||||
bin_PROGRAMS = kill
|
||||
dist_man_MANS += kill.1
|
||||
kill_SOURCES = skill.c $(top_srcdir)/lib/strutils.c $(top_srcdir)/lib/fileutils.c $(top_srcdir)/lib/nsutils.c
|
||||
kill_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/nsutils.c
|
||||
else
|
||||
EXTRA_DIST += kill.1
|
||||
endif
|
||||
@ -80,9 +80,9 @@ usrbin_exec_PROGRAMS += \
|
||||
dist_man_MANS += \
|
||||
slabtop.1 \
|
||||
watch.1
|
||||
slabtop_SOURCES = slabtop.c $(top_srcdir)/lib/strutils.c $(top_srcdir)/lib/fileutils.c
|
||||
slabtop_SOURCES = slabtop.c lib/strutils.c lib/fileutils.c
|
||||
slabtop_LDADD = @NCURSES_LIBS@
|
||||
watch_SOURCES = watch.c $(top_srcdir)/lib/strutils.c $(top_srcdir)/lib/fileutils.c
|
||||
watch_SOURCES = watch.c lib/strutils.c lib/fileutils.c
|
||||
watch_LDADD = @WATCH_NCURSES_LIBS@
|
||||
endif
|
||||
|
||||
@ -90,8 +90,8 @@ if BUILD_SKILL
|
||||
usrbin_exec_PROGRAMS += \
|
||||
skill \
|
||||
snice
|
||||
skill_SOURCES = skill.c $(top_srcdir)/lib/strutils.c $(top_srcdir)/lib/fileutils.c $(top_srcdir)/lib/nsutils.c
|
||||
snice_SOURCES = skill.c $(top_srcdir)/lib/strutils.c $(top_srcdir)/lib/fileutils.c $(top_srcdir)/lib/nsutils.c
|
||||
skill_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/nsutils.c
|
||||
snice_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/nsutils.c
|
||||
dist_man_MANS += \
|
||||
skill.1 \
|
||||
snice.1
|
||||
@ -101,16 +101,16 @@ else
|
||||
snice.1
|
||||
endif
|
||||
|
||||
free_SOURCES = free.c $(top_srcdir)/lib/strutils.c $(top_srcdir)/lib/fileutils.c
|
||||
pgrep_SOURCES = pgrep.c $(top_srcdir)/lib/fileutils.c $(top_srcdir)/lib/nsutils.c
|
||||
pkill_SOURCES = pgrep.c $(top_srcdir)/lib/fileutils.c $(top_srcdir)/lib/nsutils.c
|
||||
pmap_SOURCES = pmap.c $(top_srcdir)/lib/fileutils.c
|
||||
pwdx_SOURCES = pwdx.c $(top_srcdir)/lib/fileutils.c
|
||||
sysctl_SOURCES = sysctl.c $(top_srcdir)/lib/fileutils.c
|
||||
tload_SOURCES = tload.c $(top_srcdir)/lib/strutils.c $(top_srcdir)/lib/fileutils.c
|
||||
uptime_SOURCES = uptime.c $(top_srcdir)/lib/fileutils.c
|
||||
vmstat_SOURCES = vmstat.c $(top_srcdir)/lib/strutils.c $(top_srcdir)/lib/fileutils.c
|
||||
w_SOURCES = w.c $(top_srcdir)/lib/fileutils.c
|
||||
free_SOURCES = free.c lib/strutils.c lib/fileutils.c
|
||||
pgrep_SOURCES = pgrep.c lib/fileutils.c lib/nsutils.c
|
||||
pkill_SOURCES = pgrep.c lib/fileutils.c lib/nsutils.c
|
||||
pmap_SOURCES = pmap.c lib/fileutils.c
|
||||
pwdx_SOURCES = pwdx.c lib/fileutils.c
|
||||
sysctl_SOURCES = sysctl.c lib/fileutils.c
|
||||
tload_SOURCES = tload.c lib/strutils.c lib/fileutils.c
|
||||
uptime_SOURCES = uptime.c lib/fileutils.c
|
||||
vmstat_SOURCES = vmstat.c lib/strutils.c lib/fileutils.c
|
||||
w_SOURCES = w.c lib/fileutils.c
|
||||
|
||||
if EXAMPLE_FILES
|
||||
sysconf_DATA = sysctl.conf
|
||||
|
Loading…
Reference in New Issue
Block a user