From 4d37a4a1624fa39462ca7dfa3347754d2f2364bf Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Thu, 26 Jun 2014 15:51:02 -0600 Subject: [PATCH] Top level directory reorg Move src/po -> po Combine common and compat -> lib/util Move zlib -> lib/zlib --- .hgignore | 8 +- MANIFEST | 351 ++++++----- Makefile.in | 21 +- common/Makefile.in | 312 ---------- compat/Makefile.in | 244 -------- configure | 23 +- configure.ac | 17 +- {compat => include/compat}/charclass.h | 0 {compat => include/compat}/endian.h | 0 {compat => include/compat}/fnmatch.h | 0 {compat => include/compat}/getaddrinfo.h | 0 {compat => include/compat}/getopt.h | 0 {compat => include/compat}/glob.h | 0 {compat => include/compat}/mksiglist.h | 0 {compat => include/compat}/mksigname.h | 0 {compat => include/compat}/nss_dbdefs.h | 0 {compat => include/compat}/sha2.h | 0 {compat => include/compat}/stdbool.h | 0 {compat => include/compat}/timespec.h | 0 {compat => include/compat}/utime.h | 0 lib/util/Makefile.in | 433 +++++++++++++ {common => lib/util}/aix.c | 0 {common => lib/util}/alloc.c | 0 {common => lib/util}/atobool.c | 0 {common => lib/util}/atoid.c | 0 {common => lib/util}/atomode.c | 0 {compat => lib/util}/clock_gettime.c | 0 {compat => lib/util}/closefrom.c | 0 {common => lib/util}/event.c | 0 {common => lib/util}/event_poll.c | 0 {common => lib/util}/event_select.c | 0 {common => lib/util}/fatal.c | 0 {common => lib/util}/fileops.c | 0 {common => lib/util}/fmt_string.c | 0 {compat => lib/util}/fnmatch.c | 0 {compat => lib/util}/getaddrinfo.c | 0 {compat => lib/util}/getcwd.c | 0 {compat => lib/util}/getgrouplist.c | 0 {compat => lib/util}/getline.c | 0 {compat => lib/util}/getopt_long.c | 0 {common => lib/util}/gidlist.c | 0 {compat => lib/util}/glob.c | 0 {compat => lib/util}/inet_pton.c | 0 {compat => lib/util}/isblank.c | 0 {common => lib/util}/lbuf.c | 0 {compat => lib/util}/memrchr.c | 0 {compat => lib/util}/memset_s.c | 0 {compat => lib/util}/mksiglist.c | 0 {compat => lib/util}/mksigname.c | 0 {compat => lib/util}/mktemp.c | 0 {common => lib/util}/progname.c | 0 {compat => lib/util}/pw_dup.c | 0 .../util}/regress/atofoo/atofoo_test.c | 0 .../util}/regress/fnmatch/fnm_test.c | 0 .../util}/regress/fnmatch/fnm_test.in | 0 {compat => lib/util}/regress/glob/files | 0 {compat => lib/util}/regress/glob/globtest.c | 0 {compat => lib/util}/regress/glob/globtest.in | 0 .../util}/regress/sudo_conf/conf_test.c | 0 .../util}/regress/sudo_conf/test1.in | 0 .../util}/regress/sudo_conf/test1.out.ok | 0 .../util}/regress/sudo_conf/test2.in | 0 .../util}/regress/sudo_conf/test2.out.ok | 0 .../util}/regress/sudo_conf/test3.in | 0 .../util}/regress/sudo_conf/test3.out.ok | 0 .../util}/regress/sudo_conf/test4.in | 0 .../util}/regress/sudo_conf/test4.out.ok | 0 .../util}/regress/sudo_conf/test5.err.ok | 0 .../util}/regress/sudo_conf/test5.in | 0 .../util}/regress/sudo_conf/test5.out.ok | 0 .../util}/regress/sudo_conf/test6.in | 0 .../util}/regress/sudo_conf/test6.out.ok | 0 .../util}/regress/sudo_parseln/parseln_test.c | 0 .../util}/regress/sudo_parseln/test1.in | 0 .../util}/regress/sudo_parseln/test1.out.ok | 0 .../util}/regress/sudo_parseln/test2.in | 0 .../util}/regress/sudo_parseln/test2.out.ok | 0 .../util}/regress/sudo_parseln/test3.in | 0 .../util}/regress/sudo_parseln/test3.out.ok | 0 .../util}/regress/sudo_parseln/test4.in | 0 .../util}/regress/sudo_parseln/test4.out.ok | 0 .../util}/regress/sudo_parseln/test5.in | 0 .../util}/regress/sudo_parseln/test5.out.ok | 0 .../util}/regress/sudo_parseln/test6.in | 0 .../util}/regress/sudo_parseln/test6.out.ok | 0 .../util}/regress/tailq/hltq_test.c | 0 {common => lib/util}/secure_path.c | 0 {common => lib/util}/setgroups.c | 0 {compat => lib/util}/sha2.c | 2 +- {compat => lib/util}/sig2str.c | 0 {compat => lib/util}/siglist.in | 0 {compat => lib/util}/snprintf.c | 0 {compat => lib/util}/strlcat.c | 0 {compat => lib/util}/strlcpy.c | 0 {compat => lib/util}/strsignal.c | 0 {compat => lib/util}/strtonum.c | 0 {common => lib/util}/sudo_conf.c | 0 {common => lib/util}/sudo_debug.c | 0 {common => lib/util}/sudo_dso.c | 0 {common => lib/util}/sudo_printf.c | 0 {common => lib/util}/term.c | 0 {common => lib/util}/ttysize.c | 0 {compat => lib/util}/utimes.c | 0 {zlib => lib/zlib}/Makefile.in | 2 +- {zlib => lib/zlib}/adler32.c | 0 {zlib => lib/zlib}/compress.c | 0 {zlib => lib/zlib}/crc32.c | 0 {zlib => lib/zlib}/crc32.h | 0 {zlib => lib/zlib}/deflate.c | 0 {zlib => lib/zlib}/deflate.h | 0 {zlib => lib/zlib}/gzclose.c | 0 {zlib => lib/zlib}/gzguts.h | 0 {zlib => lib/zlib}/gzlib.c | 0 {zlib => lib/zlib}/gzread.c | 0 {zlib => lib/zlib}/gzwrite.c | 0 {zlib => lib/zlib}/infback.c | 0 {zlib => lib/zlib}/inffast.c | 0 {zlib => lib/zlib}/inffast.h | 0 {zlib => lib/zlib}/inffixed.h | 0 {zlib => lib/zlib}/inflate.c | 0 {zlib => lib/zlib}/inflate.h | 0 {zlib => lib/zlib}/inftrees.c | 0 {zlib => lib/zlib}/inftrees.h | 0 {zlib => lib/zlib}/trees.c | 0 {zlib => lib/zlib}/trees.h | 0 {zlib => lib/zlib}/uncompr.c | 0 {zlib => lib/zlib}/zconf.h.in | 0 {zlib => lib/zlib}/zlib.h | 0 {zlib => lib/zlib}/zutil.c | 0 {zlib => lib/zlib}/zutil.h | 0 plugins/group_file/Makefile.in | 12 +- plugins/sample/Makefile.in | 10 +- plugins/sudoers/Makefile.in | 589 +++++++++--------- plugins/system_group/Makefile.in | 10 +- {src/po => po}/README | 0 {src/po => po}/ca.mo | Bin {src/po => po}/ca.po | 0 {src/po => po}/cs.mo | Bin {src/po => po}/cs.po | 0 {src/po => po}/da.mo | Bin {src/po => po}/da.po | 0 {src/po => po}/de.mo | Bin {src/po => po}/de.po | 0 {src/po => po}/eo.mo | Bin {src/po => po}/eo.po | 0 {src/po => po}/es.mo | Bin {src/po => po}/es.po | 0 {src/po => po}/eu.mo | Bin {src/po => po}/eu.po | 0 {src/po => po}/fi.mo | Bin {src/po => po}/fi.po | 0 {src/po => po}/fr.mo | Bin {src/po => po}/fr.po | 0 {src/po => po}/gl.mo | Bin {src/po => po}/gl.po | 0 {src/po => po}/hr.mo | Bin {src/po => po}/hr.po | 0 {src/po => po}/it.mo | Bin {src/po => po}/it.po | 0 {src/po => po}/ja.mo | Bin {src/po => po}/ja.po | 0 {src/po => po}/nb.mo | Bin {src/po => po}/nb.po | 0 {src/po => po}/nl.mo | Bin {src/po => po}/nl.po | 0 {src/po => po}/pl.mo | Bin {src/po => po}/pl.po | 0 {src/po => po}/pt_BR.mo | Bin {src/po => po}/pt_BR.po | 0 {src/po => po}/ru.mo | Bin {src/po => po}/ru.po | 0 {src/po => po}/sl.mo | Bin {src/po => po}/sl.po | 0 {src/po => po}/sr.mo | Bin {src/po => po}/sr.po | 0 {src/po => po}/sudo.pot | 0 {src/po => po}/sv.mo | Bin {src/po => po}/sv.po | 0 {src/po => po}/tr.mo | Bin {src/po => po}/tr.po | 0 {src/po => po}/uk.mo | Bin {src/po => po}/uk.po | 0 {src/po => po}/vi.mo | Bin {src/po => po}/vi.po | 0 {src/po => po}/zh_CN.mo | Bin {src/po => po}/zh_CN.po | 0 src/Makefile.in | 222 +++---- 187 files changed, 1061 insertions(+), 1195 deletions(-) delete mode 100644 common/Makefile.in delete mode 100644 compat/Makefile.in rename {compat => include/compat}/charclass.h (100%) rename {compat => include/compat}/endian.h (100%) rename {compat => include/compat}/fnmatch.h (100%) rename {compat => include/compat}/getaddrinfo.h (100%) rename {compat => include/compat}/getopt.h (100%) rename {compat => include/compat}/glob.h (100%) rename {compat => include/compat}/mksiglist.h (100%) rename {compat => include/compat}/mksigname.h (100%) rename {compat => include/compat}/nss_dbdefs.h (100%) rename {compat => include/compat}/sha2.h (100%) rename {compat => include/compat}/stdbool.h (100%) rename {compat => include/compat}/timespec.h (100%) rename {compat => include/compat}/utime.h (100%) create mode 100644 lib/util/Makefile.in rename {common => lib/util}/aix.c (100%) rename {common => lib/util}/alloc.c (100%) rename {common => lib/util}/atobool.c (100%) rename {common => lib/util}/atoid.c (100%) rename {common => lib/util}/atomode.c (100%) rename {compat => lib/util}/clock_gettime.c (100%) rename {compat => lib/util}/closefrom.c (100%) rename {common => lib/util}/event.c (100%) rename {common => lib/util}/event_poll.c (100%) rename {common => lib/util}/event_select.c (100%) rename {common => lib/util}/fatal.c (100%) rename {common => lib/util}/fileops.c (100%) rename {common => lib/util}/fmt_string.c (100%) rename {compat => lib/util}/fnmatch.c (100%) rename {compat => lib/util}/getaddrinfo.c (100%) rename {compat => lib/util}/getcwd.c (100%) rename {compat => lib/util}/getgrouplist.c (100%) rename {compat => lib/util}/getline.c (100%) rename {compat => lib/util}/getopt_long.c (100%) rename {common => lib/util}/gidlist.c (100%) rename {compat => lib/util}/glob.c (100%) rename {compat => lib/util}/inet_pton.c (100%) rename {compat => lib/util}/isblank.c (100%) rename {common => lib/util}/lbuf.c (100%) rename {compat => lib/util}/memrchr.c (100%) rename {compat => lib/util}/memset_s.c (100%) rename {compat => lib/util}/mksiglist.c (100%) rename {compat => lib/util}/mksigname.c (100%) rename {compat => lib/util}/mktemp.c (100%) rename {common => lib/util}/progname.c (100%) rename {compat => lib/util}/pw_dup.c (100%) rename {common => lib/util}/regress/atofoo/atofoo_test.c (100%) rename {compat => lib/util}/regress/fnmatch/fnm_test.c (100%) rename {compat => lib/util}/regress/fnmatch/fnm_test.in (100%) rename {compat => lib/util}/regress/glob/files (100%) rename {compat => lib/util}/regress/glob/globtest.c (100%) rename {compat => lib/util}/regress/glob/globtest.in (100%) rename {common => lib/util}/regress/sudo_conf/conf_test.c (100%) rename {common => lib/util}/regress/sudo_conf/test1.in (100%) rename {common => lib/util}/regress/sudo_conf/test1.out.ok (100%) rename {common => lib/util}/regress/sudo_conf/test2.in (100%) rename {common => lib/util}/regress/sudo_conf/test2.out.ok (100%) rename {common => lib/util}/regress/sudo_conf/test3.in (100%) rename {common => lib/util}/regress/sudo_conf/test3.out.ok (100%) rename {common => lib/util}/regress/sudo_conf/test4.in (100%) rename {common => lib/util}/regress/sudo_conf/test4.out.ok (100%) rename {common => lib/util}/regress/sudo_conf/test5.err.ok (100%) rename {common => lib/util}/regress/sudo_conf/test5.in (100%) rename {common => lib/util}/regress/sudo_conf/test5.out.ok (100%) rename {common => lib/util}/regress/sudo_conf/test6.in (100%) rename {common => lib/util}/regress/sudo_conf/test6.out.ok (100%) rename {common => lib/util}/regress/sudo_parseln/parseln_test.c (100%) rename {common => lib/util}/regress/sudo_parseln/test1.in (100%) rename {common => lib/util}/regress/sudo_parseln/test1.out.ok (100%) rename {common => lib/util}/regress/sudo_parseln/test2.in (100%) rename {common => lib/util}/regress/sudo_parseln/test2.out.ok (100%) rename {common => lib/util}/regress/sudo_parseln/test3.in (100%) rename {common => lib/util}/regress/sudo_parseln/test3.out.ok (100%) rename {common => lib/util}/regress/sudo_parseln/test4.in (100%) rename {common => lib/util}/regress/sudo_parseln/test4.out.ok (100%) rename {common => lib/util}/regress/sudo_parseln/test5.in (100%) rename {common => lib/util}/regress/sudo_parseln/test5.out.ok (100%) rename {common => lib/util}/regress/sudo_parseln/test6.in (100%) rename {common => lib/util}/regress/sudo_parseln/test6.out.ok (100%) rename {common => lib/util}/regress/tailq/hltq_test.c (100%) rename {common => lib/util}/secure_path.c (100%) rename {common => lib/util}/setgroups.c (100%) rename {compat => lib/util}/sha2.c (99%) rename {compat => lib/util}/sig2str.c (100%) rename {compat => lib/util}/siglist.in (100%) rename {compat => lib/util}/snprintf.c (100%) rename {compat => lib/util}/strlcat.c (100%) rename {compat => lib/util}/strlcpy.c (100%) rename {compat => lib/util}/strsignal.c (100%) rename {compat => lib/util}/strtonum.c (100%) rename {common => lib/util}/sudo_conf.c (100%) rename {common => lib/util}/sudo_debug.c (100%) rename {common => lib/util}/sudo_dso.c (100%) rename {common => lib/util}/sudo_printf.c (100%) rename {common => lib/util}/term.c (100%) rename {common => lib/util}/ttysize.c (100%) rename {compat => lib/util}/utimes.c (100%) rename {zlib => lib/zlib}/Makefile.in (98%) rename {zlib => lib/zlib}/adler32.c (100%) rename {zlib => lib/zlib}/compress.c (100%) rename {zlib => lib/zlib}/crc32.c (100%) rename {zlib => lib/zlib}/crc32.h (100%) rename {zlib => lib/zlib}/deflate.c (100%) rename {zlib => lib/zlib}/deflate.h (100%) rename {zlib => lib/zlib}/gzclose.c (100%) rename {zlib => lib/zlib}/gzguts.h (100%) rename {zlib => lib/zlib}/gzlib.c (100%) rename {zlib => lib/zlib}/gzread.c (100%) rename {zlib => lib/zlib}/gzwrite.c (100%) rename {zlib => lib/zlib}/infback.c (100%) rename {zlib => lib/zlib}/inffast.c (100%) rename {zlib => lib/zlib}/inffast.h (100%) rename {zlib => lib/zlib}/inffixed.h (100%) rename {zlib => lib/zlib}/inflate.c (100%) rename {zlib => lib/zlib}/inflate.h (100%) rename {zlib => lib/zlib}/inftrees.c (100%) rename {zlib => lib/zlib}/inftrees.h (100%) rename {zlib => lib/zlib}/trees.c (100%) rename {zlib => lib/zlib}/trees.h (100%) rename {zlib => lib/zlib}/uncompr.c (100%) rename {zlib => lib/zlib}/zconf.h.in (100%) rename {zlib => lib/zlib}/zlib.h (100%) rename {zlib => lib/zlib}/zutil.c (100%) rename {zlib => lib/zlib}/zutil.h (100%) rename {src/po => po}/README (100%) rename {src/po => po}/ca.mo (100%) rename {src/po => po}/ca.po (100%) rename {src/po => po}/cs.mo (100%) rename {src/po => po}/cs.po (100%) rename {src/po => po}/da.mo (100%) rename {src/po => po}/da.po (100%) rename {src/po => po}/de.mo (100%) rename {src/po => po}/de.po (100%) rename {src/po => po}/eo.mo (100%) rename {src/po => po}/eo.po (100%) rename {src/po => po}/es.mo (100%) rename {src/po => po}/es.po (100%) rename {src/po => po}/eu.mo (100%) rename {src/po => po}/eu.po (100%) rename {src/po => po}/fi.mo (100%) rename {src/po => po}/fi.po (100%) rename {src/po => po}/fr.mo (100%) rename {src/po => po}/fr.po (100%) rename {src/po => po}/gl.mo (100%) rename {src/po => po}/gl.po (100%) rename {src/po => po}/hr.mo (100%) rename {src/po => po}/hr.po (100%) rename {src/po => po}/it.mo (100%) rename {src/po => po}/it.po (100%) rename {src/po => po}/ja.mo (100%) rename {src/po => po}/ja.po (100%) rename {src/po => po}/nb.mo (100%) rename {src/po => po}/nb.po (100%) rename {src/po => po}/nl.mo (100%) rename {src/po => po}/nl.po (100%) rename {src/po => po}/pl.mo (100%) rename {src/po => po}/pl.po (100%) rename {src/po => po}/pt_BR.mo (100%) rename {src/po => po}/pt_BR.po (100%) rename {src/po => po}/ru.mo (100%) rename {src/po => po}/ru.po (100%) rename {src/po => po}/sl.mo (100%) rename {src/po => po}/sl.po (100%) rename {src/po => po}/sr.mo (100%) rename {src/po => po}/sr.po (100%) rename {src/po => po}/sudo.pot (100%) rename {src/po => po}/sv.mo (100%) rename {src/po => po}/sv.po (100%) rename {src/po => po}/tr.mo (100%) rename {src/po => po}/tr.po (100%) rename {src/po => po}/uk.mo (100%) rename {src/po => po}/uk.po (100%) rename {src/po => po}/vi.mo (100%) rename {src/po => po}/vi.po (100%) rename {src/po => po}/zh_CN.mo (100%) rename {src/po => po}/zh_CN.po (100%) diff --git a/.hgignore b/.hgignore index 9487729c3..b8188830b 100644 --- a/.hgignore +++ b/.hgignore @@ -30,10 +30,10 @@ Makefile$ ^src/check_ttyname$ ^src/sudo_usage\.h$ -^compat/mksiglist$ -^compat/mksigname$ -^compat/siglist\.c$ -^compat/signame\.c$ +^lib/util/mksiglist$ +^lib/util/mksigname$ +^lib/util/siglist\.c$ +^lib/util/signame\.c$ ^plugins/sudoers/(sudoers|sudoreplay|testsudoers|visudo|check_[a-z_]+)$ ^plugins/sudoers/.*\.(out|toke|err)$ diff --git a/MANIFEST b/MANIFEST index 2a9184f86..aa1cf59b5 100644 --- a/MANIFEST +++ b/MANIFEST @@ -8,103 +8,6 @@ README README.LDAP aclocal.m4 autogen.sh -common/Makefile.in -common/aix.c -common/alloc.c -common/atobool.c -common/atoid.c -common/atomode.c -common/event.c -common/event_poll.c -common/event_select.c -common/fatal.c -common/fileops.c -common/fmt_string.c -common/gidlist.c -common/lbuf.c -common/progname.c -common/regress/atofoo/atofoo_test.c -common/regress/sudo_conf/conf_test.c -common/regress/sudo_conf/test1.in -common/regress/sudo_conf/test1.out.ok -common/regress/sudo_conf/test2.in -common/regress/sudo_conf/test2.out.ok -common/regress/sudo_conf/test3.in -common/regress/sudo_conf/test3.out.ok -common/regress/sudo_conf/test4.in -common/regress/sudo_conf/test4.out.ok -common/regress/sudo_conf/test5.err.ok -common/regress/sudo_conf/test5.in -common/regress/sudo_conf/test5.out.ok -common/regress/sudo_conf/test6.in -common/regress/sudo_conf/test6.out.ok -common/regress/sudo_parseln/parseln_test.c -common/regress/sudo_parseln/test1.in -common/regress/sudo_parseln/test1.out.ok -common/regress/sudo_parseln/test2.in -common/regress/sudo_parseln/test2.out.ok -common/regress/sudo_parseln/test3.in -common/regress/sudo_parseln/test3.out.ok -common/regress/sudo_parseln/test4.in -common/regress/sudo_parseln/test4.out.ok -common/regress/sudo_parseln/test5.in -common/regress/sudo_parseln/test5.out.ok -common/regress/sudo_parseln/test6.in -common/regress/sudo_parseln/test6.out.ok -common/regress/tailq/hltq_test.c -common/secure_path.c -common/setgroups.c -common/sudo_conf.c -common/sudo_debug.c -common/sudo_dso.c -common/sudo_printf.c -common/term.c -common/ttysize.c -compat/Makefile.in -compat/charclass.h -compat/clock_gettime.c -compat/closefrom.c -compat/endian.h -compat/fnmatch.c -compat/fnmatch.h -compat/getaddrinfo.c -compat/getaddrinfo.h -compat/getcwd.c -compat/getgrouplist.c -compat/getline.c -compat/getopt.h -compat/getopt_long.c -compat/glob.c -compat/glob.h -compat/inet_pton.c -compat/isblank.c -compat/memrchr.c -compat/memset_s.c -compat/mksiglist.c -compat/mksiglist.h -compat/mksigname.c -compat/mksigname.h -compat/mktemp.c -compat/nss_dbdefs.h -compat/pw_dup.c -compat/regress/fnmatch/fnm_test.c -compat/regress/fnmatch/fnm_test.in -compat/regress/glob/files -compat/regress/glob/globtest.c -compat/regress/glob/globtest.in -compat/sha2.c -compat/sha2.h -compat/sig2str.c -compat/siglist.in -compat/snprintf.c -compat/stdbool.h -compat/strlcat.c -compat/strlcpy.c -compat/strsignal.c -compat/strtonum.c -compat/timespec.h -compat/utime.h -compat/utimes.c config.guess config.h.in config.sub @@ -148,6 +51,19 @@ doc/visudo.man.in doc/visudo.mdoc.in include/Makefile.in include/alloc.h +include/compat/charclass.h/ +include/compat/endian.h/ +include/compat/fnmatch.h/ +include/compat/getaddrinfo.h/ +include/compat/getopt.h/ +include/compat/glob.h/ +include/compat/mksiglist.h/ +include/compat/mksigname.h/ +include/compat/nss_dbdefs.h/ +include/compat/sha2.h/ +include/compat/stdbool.h/ +include/compat/timespec.h/ +include/compat/utime.h/ include/fatal.h include/fileops.h include/gettext.h @@ -165,6 +81,116 @@ indent.pro init.d/aix.sh.in init.d/hpux.sh.in install-sh +lib/util/Makefile.in +lib/util/aix.c +lib/util/alloc.c +lib/util/atobool.c +lib/util/atoid.c +lib/util/atomode.c +lib/util/clock_gettime.c +lib/util/closefrom.c +lib/util/event.c +lib/util/event_poll.c +lib/util/event_select.c +lib/util/fatal.c +lib/util/fileops.c +lib/util/fmt_string.c +lib/util/fnmatch.c +lib/util/getaddrinfo.c +lib/util/getcwd.c +lib/util/getgrouplist.c +lib/util/getline.c +lib/util/getopt_long.c +lib/util/gidlist.c +lib/util/glob.c +lib/util/inet_pton.c +lib/util/isblank.c +lib/util/lbuf.c +lib/util/memrchr.c +lib/util/memset_s.c +lib/util/mksiglist.c +lib/util/mksigname.c +lib/util/mktemp.c +lib/util/progname.c +lib/util/pw_dup.c +lib/util/regress/atofoo/atofoo_test.c +lib/util/regress/fnmatch/fnm_test.c +lib/util/regress/fnmatch/fnm_test.in +lib/util/regress/glob/files +lib/util/regress/glob/globtest.c +lib/util/regress/glob/globtest.in +lib/util/regress/sudo_conf/conf_test.c +lib/util/regress/sudo_conf/test1.in +lib/util/regress/sudo_conf/test1.out.ok +lib/util/regress/sudo_conf/test2.in +lib/util/regress/sudo_conf/test2.out.ok +lib/util/regress/sudo_conf/test3.in +lib/util/regress/sudo_conf/test3.out.ok +lib/util/regress/sudo_conf/test4.in +lib/util/regress/sudo_conf/test4.out.ok +lib/util/regress/sudo_conf/test5.err.ok +lib/util/regress/sudo_conf/test5.in +lib/util/regress/sudo_conf/test5.out.ok +lib/util/regress/sudo_conf/test6.in +lib/util/regress/sudo_conf/test6.out.ok +lib/util/regress/sudo_parseln/parseln_test.c +lib/util/regress/sudo_parseln/test1.in +lib/util/regress/sudo_parseln/test1.out.ok +lib/util/regress/sudo_parseln/test2.in +lib/util/regress/sudo_parseln/test2.out.ok +lib/util/regress/sudo_parseln/test3.in +lib/util/regress/sudo_parseln/test3.out.ok +lib/util/regress/sudo_parseln/test4.in +lib/util/regress/sudo_parseln/test4.out.ok +lib/util/regress/sudo_parseln/test5.in +lib/util/regress/sudo_parseln/test5.out.ok +lib/util/regress/sudo_parseln/test6.in +lib/util/regress/sudo_parseln/test6.out.ok +lib/util/regress/tailq/hltq_test.c +lib/util/secure_path.c +lib/util/setgroups.c +lib/util/sha2.c +lib/util/sig2str.c +lib/util/siglist.in +lib/util/snprintf.c +lib/util/strlcat.c +lib/util/strlcpy.c +lib/util/strsignal.c +lib/util/strtonum.c +lib/util/sudo_conf.c +lib/util/sudo_debug.c +lib/util/sudo_dso.c +lib/util/sudo_printf.c +lib/util/term.c +lib/util/ttysize.c +lib/util/utimes.c +lib/zlib/Makefile.in +lib/zlib/adler32.c +lib/zlib/compress.c +lib/zlib/crc32.c +lib/zlib/crc32.h +lib/zlib/deflate.c +lib/zlib/deflate.h +lib/zlib/gzclose.c +lib/zlib/gzguts.h +lib/zlib/gzlib.c +lib/zlib/gzread.c +lib/zlib/gzwrite.c +lib/zlib/infback.c +lib/zlib/inffast.c +lib/zlib/inffast.h +lib/zlib/inffixed.h +lib/zlib/inflate.c +lib/zlib/inflate.h +lib/zlib/inftrees.c +lib/zlib/inftrees.h +lib/zlib/trees.c +lib/zlib/trees.h +lib/zlib/uncompr.c +lib/zlib/zconf.h.in +lib/zlib/zlib.h +lib/zlib/zutil.c +lib/zlib/zutil.h ltmain.sh m4/ax_check_compile_flag.m4 m4/ax_check_link_flag.m4 @@ -419,6 +445,58 @@ plugins/sudoers/visudo_json.c plugins/system_group/Makefile.in plugins/system_group/system_group.c plugins/system_group/system_group.exp +po/README +po/ca.mo +po/ca.po +po/cs.mo +po/cs.po +po/da.mo +po/da.po +po/de.mo +po/de.po +po/eo.mo +po/eo.po +po/es.mo +po/es.po +po/eu.mo +po/eu.po +po/fi.mo +po/fi.po +po/fr.mo +po/fr.po +po/gl.mo +po/gl.po +po/hr.mo +po/hr.po +po/it.mo +po/it.po +po/ja.mo +po/ja.po +po/nb.mo +po/nb.po +po/nl.mo +po/nl.po +po/pl.mo +po/pl.po +po/pt_BR.mo +po/pt_BR.po +po/ru.mo +po/ru.po +po/sl.mo +po/sl.po +po/sr.mo +po/sr.po +po/sudo.pot +po/sv.mo +po/sv.po +po/tr.mo +po/tr.po +po/uk.mo +po/uk.po +po/vi.mo +po/vi.po +po/zh_CN.mo +po/zh_CN.po pp src/Makefile.in src/conversation.c @@ -433,58 +511,6 @@ src/locale_stub.c src/net_ifs.c src/openbsd.c src/parse_args.c -src/po/README -src/po/ca.mo -src/po/ca.po -src/po/cs.mo -src/po/cs.po -src/po/da.mo -src/po/da.po -src/po/de.mo -src/po/de.po -src/po/eo.mo -src/po/eo.po -src/po/es.mo -src/po/es.po -src/po/eu.mo -src/po/eu.po -src/po/fi.mo -src/po/fi.po -src/po/fr.mo -src/po/fr.po -src/po/gl.mo -src/po/gl.po -src/po/hr.mo -src/po/hr.po -src/po/it.mo -src/po/it.po -src/po/ja.mo -src/po/ja.po -src/po/nb.mo -src/po/nb.po -src/po/nl.mo -src/po/nl.po -src/po/pl.mo -src/po/pl.po -src/po/pt_BR.mo -src/po/pt_BR.po -src/po/ru.mo -src/po/ru.po -src/po/sl.mo -src/po/sl.po -src/po/sr.mo -src/po/sr.po -src/po/sudo.pot -src/po/sv.mo -src/po/sv.po -src/po/tr.mo -src/po/tr.po -src/po/uk.mo -src/po/uk.po -src/po/vi.mo -src/po/vi.po -src/po/zh_CN.mo -src/po/zh_CN.po src/preload.c src/preserve_fds.c src/regress/ttyname/check_ttyname.c @@ -503,30 +529,3 @@ src/tgetpass.c src/ttyname.c src/utmp.c sudo.pp -zlib/Makefile.in -zlib/adler32.c -zlib/compress.c -zlib/crc32.c -zlib/crc32.h -zlib/deflate.c -zlib/deflate.h -zlib/gzclose.c -zlib/gzguts.h -zlib/gzlib.c -zlib/gzread.c -zlib/gzwrite.c -zlib/infback.c -zlib/inffast.c -zlib/inffast.h -zlib/inffixed.h -zlib/inflate.c -zlib/inflate.h -zlib/inftrees.c -zlib/inftrees.h -zlib/trees.c -zlib/trees.h -zlib/uncompr.c -zlib/zconf.h.in -zlib/zlib.h -zlib/zutil.c -zlib/zutil.h diff --git a/Makefile.in b/Makefile.in index c8af86610..78b0ab551 100644 --- a/Makefile.in +++ b/Makefile.in @@ -47,7 +47,7 @@ sudoers_gid = @SUDOERS_GID@ sudoers_mode = @SUDOERS_MODE@ shlib_mode = @SHLIB_MODE@ -SUBDIRS = compat common @ZLIB_SRC@ plugins/group_file plugins/sudoers \ +SUBDIRS = lib/util @ZLIB_SRC@ plugins/group_file plugins/sudoers \ plugins/system_group src include doc SAMPLES = plugins/sample @@ -66,7 +66,7 @@ ECHO_C = @ECHO_C@ # Message catalog support NLS = @SUDO_NLS@ -POTFILES = src/po/sudo.pot plugins/sudoers/po/sudoers.pot +POTFILES = po/sudo.pot plugins/sudoers/po/sudoers.pot LOCALEDIR_SUFFIX = @LOCALEDIR_SUFFIX@ MSGFMT = msgfmt MSGMERGE = msgmerge @@ -133,26 +133,25 @@ uninstall-nls: done siglist.c signame.c: - (cd compat && exec $(MAKE) $@) + (cd lib/util && exec $(MAKE) $@) depend: siglist.c signame.c @if test "$(srcdir)" != "."; then \ echo "make depend only supported in the source directory"; \ exit 1; \ fi; \ - $(srcdir)/mkdep.pl $(srcdir)/common/Makefile.in \ - $(srcdir)/compat/Makefile.in $(srcdir)/plugins/sample/Makefile.in \ + $(srcdir)/mkdep.pl $(srcdir)/lib/util/Makefile.in \ + $(srcdir)/plugins/sample/Makefile.in \ $(srcdir)/plugins/group_file/Makefile.in \ $(srcdir)/plugins/sudoers/Makefile.in \ $(srcdir)/plugins/system_group/Makefile.in \ - $(srcdir)/src/Makefile.in $(srcdir)/zlib/Makefile.in; \ - ./config.status --file $(srcdir)/common/Makefile \ - --file $(srcdir)/compat/Makefile \ + $(srcdir)/src/Makefile.in $(srcdir)/lib/zlib/Makefile.in; \ + ./config.status --file $(srcdir)/lib/util/Makefile \ --file $(srcdir)/plugins/sample/Makefile \ --file $(srcdir)/plugins/group_file/Makefile \ --file $(srcdir)/plugins/sudoers/Makefile \ --file $(srcdir)/plugins/system_group/Makefile \ - --file $(srcdir)/src/Makefile --file $(srcdir)/zlib/Makefile + --file $(srcdir)/src/Makefile --file $(srcdir)/lib/zlib/Makefile ChangeLog: if test -d $(srcdir)/.hg && cd $(srcdir); then \ @@ -178,7 +177,7 @@ Makefile: $(srcdir)/Makefile.in sync-po: rsync-po compile-po rsync-po: - rsync -Lrtvz translationproject.org::tp/latest/sudo/ src/po/ + rsync -Lrtvz translationproject.org::tp/latest/sudo/ po/ rsync -Lrtvz translationproject.org::tp/latest/sudoers/ plugins/sudoers/po/ update-pot: @@ -188,7 +187,7 @@ update-pot: echo "Updating $$pot"; \ domain=`basename $$pot .pot`; \ case "$$domain" in \ - sudo) tmpfiles=; cfiles="src/*c common/*c compat/*c";; \ + sudo) tmpfiles=; cfiles="src/*c lib/*/*c";; \ sudoers) \ echo "syntax error" > confstr.sh; \ sed -n -e 's/^badpass_message="/gettext "/p' \ diff --git a/common/Makefile.in b/common/Makefile.in deleted file mode 100644 index 471f96509..000000000 --- a/common/Makefile.in +++ /dev/null @@ -1,312 +0,0 @@ -# -# Copyright (c) 2011-2014 Todd C. Miller -# -# Permission to use, copy, modify, and distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# @configure_input@ -# - -#### Start of system configuration section. #### - -srcdir = @srcdir@ -devdir = @devdir@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -incdir = $(top_srcdir)/include -cross_compiling = @CROSS_COMPILING@ - -# Where to install things... -prefix = @prefix@ -exec_prefix = @exec_prefix@ -bindir = @bindir@ -sbindir = @sbindir@ -sysconfdir = @sysconfdir@ -libexecdir = @libexecdir@ -datarootdir = @datarootdir@ -localstatedir = @localstatedir@ - -# Compiler & tools to use -CC = @CC@ -LIBTOOL = @LIBTOOL@ - -# C preprocessor flags -CPPFLAGS = -I$(incdir) -I$(top_builddir) -I$(top_srcdir) @CPPFLAGS@ - -# Usually -O and/or -g -CFLAGS = @CFLAGS@ - -# PIE flags -PIE_CFLAGS = @PIE_CFLAGS@ -PIE_LDFLAGS = @PIE_LDFLAGS@ - -# Stack smashing protection flags -SSP_CFLAGS = @SSP_CFLAGS@ -SSP_LDFLAGS = @SSP_LDFLAGS@ - -# cppcheck options, usually set in the top-level Makefile -CPPCHECK_OPTS = -q --force --enable=warning,performance,portability --suppress=constStatement --error-exitcode=1 --inline-suppr -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_HOST_NAME_MAX -U_POSIX_PATH_MAX - -# Regression tests -TEST_PROGS = atofoo_test conf_test hltq_test parseln_test -TEST_LIBS = @LIBS@ @LIBINTL@ ../compat/libreplace.la -TEST_LDFLAGS = @LDFLAGS@ - -# OS dependent defines -DEFS = @OSDEFS@ -D_PATH_SUDO_CONF=\"$(sysconfdir)/sudo.conf\" - -#### End of system configuration section. #### - -SHELL = @SHELL@ - -LTOBJS = alloc.lo atobool.lo atoid.lo atomode.lo event.lo fatal.lo fileops.lo \ - fmt_string.lo gidlist.lo lbuf.lo progname.lo secure_path.lo \ - setgroups.lo sudo_conf.lo sudo_debug.lo sudo_dso.lo sudo_printf.lo \ - term.lo ttysize.lo @COMMON_OBJS@ - -ATOFOO_TEST_OBJS = atofoo_test.lo locale_stub.lo - -PARSELN_TEST_OBJS = parseln_test.lo locale_stub.lo - -CONF_TEST_OBJS = conf_test.lo locale_stub.lo - -HLTQ_TEST_OBJS = hltq_test.lo locale_stub.lo - -all: libsudo_util.la - -Makefile: $(srcdir)/Makefile.in - (cd $(top_builddir) && ./config.status --file common/Makefile) - -.SUFFIXES: .c .h .lo - -.c.lo: - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $< - -libsudo_util.la: $(LTOBJS) - $(LIBTOOL) --mode=link $(CC) -o $@ $(LTOBJS) -no-install - -atofoo_test: $(ATOFOO_TEST_OBJS) libsudo_util.la - $(LIBTOOL) --mode=link $(CC) -o $@ $(ATOFOO_TEST_OBJS) libsudo_util.la $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS) - -conf_test: $(CONF_TEST_OBJS) libsudo_util.la - $(LIBTOOL) --mode=link $(CC) -o $@ $(CONF_TEST_OBJS) libsudo_util.la $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS) - -parseln_test: $(PARSELN_TEST_OBJS) libsudo_util.la - $(LIBTOOL) --mode=link $(CC) -o $@ $(PARSELN_TEST_OBJS) libsudo_util.la $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS) - -hltq_test: $(HLTQ_TEST_OBJS) libsudo_util.la - $(LIBTOOL) --mode=link $(CC) -o $@ $(HLTQ_TEST_OBJS) libsudo_util.la $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS) - -pre-install: - -install: - -install-dirs: - -install-binaries: - -install-includes: - -install-doc: - -install-plugin: - -uninstall: - -cppcheck: - cppcheck $(CPPCHECK_OPTS) -I$(incdir) -I$(top_builddir) -I$(top_srcdir) $(srcdir)/*.c - -# Note: some regress checks are run from srcdir for consistent error messages -check: $(TEST_PROGS) - @if test X"$(cross_compiling)" != X"yes"; then \ - rval=0; \ - ./atofoo_test || rval=`expr $$rval + $$?`; \ - ./hltq_test || rval=`expr $$rval + $$?`; \ - build_dir=`pwd`; \ - cd $(srcdir); \ - for dir in sudo_conf sudo_parseln; do \ - passed=0; failed=0; total=0; \ - mkdir -p $$build_dir/regress/$$dir; \ - for t in regress/$$dir/*.in; do \ - base=`basename $$t .in`; \ - out="$$build_dir/regress/$$dir/$${base}.out"; \ - out_ok="regress/$$dir/$${base}.out.ok"; \ - err="$$build_dir/regress/$$dir/$${base}.err"; \ - err_ok="regress/$$dir/$${base}.err.ok"; \ - if test "$$dir" = "sudo_conf"; then \ - $$build_dir/conf_test $$t >$$out 2>$$err; \ - else \ - $$build_dir/parseln_test <$$t >$$out 2>$$err; \ - fi; \ - if cmp $$out $$out_ok >/dev/null; then \ - passed=`expr $$passed + 1`; \ - echo "$$dir/$$base: OK"; \ - else \ - failed=`expr $$failed + 1`; \ - echo "$$dir/$$base: FAIL"; \ - diff $$out $$out_ok || true; \ - fi; \ - total=`expr $$total + 1`; \ - if test -s $$err_ok; then \ - if cmp $$err $$err_ok >/dev/null; then \ - passed=`expr $$passed + 1`; \ - echo "$$dir/$$base (stderr): OK"; \ - else \ - failed=`expr $$failed + 1`; \ - echo "$$dir/$$base (stderr): FAIL"; \ - diff $$err $$err_ok || true; \ - fi; \ - total=`expr $$total + 1`; \ - elif test -s $$err; then \ - failed=`expr $$failed + 1`; \ - echo "$$dir/$$base (stderr): FAIL"; \ - cat $$err 1>&2; \ - fi; \ - done; \ - if test $$failed -ne 0; then \ - rval=`expr $$rval + $$failed`; \ - fi; \ - echo "$$dir: $$passed/$$total tests passed; $$failed/$$total tests failed"; \ - done; \ - exit $$rval; \ - fi - -clean: - -$(LIBTOOL) --mode=clean rm -f $(TEST_PROGS) *.lo *.o *.la *.a stamp-* core *.core core.* regress/*/*.out - -mostlyclean: clean - -distclean: clean - -rm -rf Makefile .libs - -clobber: distclean - -realclean: distclean - rm -f TAGS tags - -cleandir: realclean - -# Autogenerated dependencies, do not modify -aix.lo: $(srcdir)/aix.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_util.h $(top_builddir)/config.h \ - $(top_srcdir)/compat/stdbool.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/aix.c -alloc.lo: $(srcdir)/alloc.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/gettext.h $(incdir)/missing.h $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/alloc.c -atobool.lo: $(srcdir)/atobool.c $(incdir)/missing.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_util.h $(top_builddir)/config.h \ - $(top_srcdir)/compat/stdbool.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/atobool.c -atofoo_test.lo: $(srcdir)/regress/atofoo/atofoo_test.c $(incdir)/fatal.h \ - $(incdir)/missing.h $(incdir)/sudo_util.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/stdbool.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/regress/atofoo/atofoo_test.c -atoid.lo: $(srcdir)/atoid.c $(incdir)/gettext.h $(incdir)/missing.h \ - $(incdir)/sudo_debug.h $(incdir)/sudo_util.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/stdbool.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/atoid.c -atomode.lo: $(srcdir)/atomode.c $(incdir)/gettext.h $(incdir)/missing.h \ - $(incdir)/sudo_debug.h $(incdir)/sudo_util.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/stdbool.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/atomode.c -conf_test.lo: $(srcdir)/regress/sudo_conf/conf_test.c $(incdir)/missing.h \ - $(incdir)/queue.h $(incdir)/sudo_conf.h $(incdir)/sudo_util.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/stdbool.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/regress/sudo_conf/conf_test.c -event.lo: $(srcdir)/event.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_event.h $(incdir)/sudo_util.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/stdbool.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/event.c -event_poll.lo: $(srcdir)/event_poll.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_event.h $(top_builddir)/config.h \ - $(top_srcdir)/compat/stdbool.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/event_poll.c -event_select.lo: $(srcdir)/event_select.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_event.h $(incdir)/sudo_util.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/stdbool.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/event_select.c -fatal.lo: $(srcdir)/fatal.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ - $(incdir)/sudo_plugin.h $(top_builddir)/config.h \ - $(top_srcdir)/compat/stdbool.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/fatal.c -fileops.lo: $(srcdir)/fileops.c $(incdir)/fileops.h $(incdir)/missing.h \ - $(incdir)/sudo_debug.h $(top_builddir)/config.h \ - $(top_srcdir)/compat/stdbool.h $(top_srcdir)/compat/timespec.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/fileops.c -fmt_string.lo: $(srcdir)/fmt_string.c $(incdir)/missing.h \ - $(incdir)/sudo_debug.h $(incdir)/sudo_util.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/stdbool.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/fmt_string.c -gidlist.lo: $(srcdir)/gidlist.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_util.h $(top_builddir)/config.h \ - $(top_srcdir)/compat/stdbool.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/gidlist.c -hltq_test.lo: $(srcdir)/regress/tailq/hltq_test.c $(incdir)/fatal.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_util.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/stdbool.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/regress/tailq/hltq_test.c -lbuf.lo: $(srcdir)/lbuf.c $(incdir)/alloc.h $(incdir)/fatal.h $(incdir)/lbuf.h \ - $(incdir)/missing.h $(incdir)/sudo_debug.h $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/lbuf.c -locale_stub.lo: $(top_srcdir)/src/locale_stub.c $(incdir)/fatal.h \ - $(incdir)/gettext.h $(incdir)/missing.h $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(top_srcdir)/src/locale_stub.c -parseln_test.lo: $(srcdir)/regress/sudo_parseln/parseln_test.c \ - $(incdir)/fileops.h $(incdir)/missing.h $(incdir)/sudo_util.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/stdbool.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/regress/sudo_parseln/parseln_test.c -progname.lo: $(srcdir)/progname.c $(incdir)/missing.h $(incdir)/sudo_util.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/stdbool.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/progname.c -secure_path.lo: $(srcdir)/secure_path.c $(incdir)/missing.h \ - $(incdir)/secure_path.h $(incdir)/sudo_debug.h \ - $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/secure_path.c -setgroups.lo: $(srcdir)/setgroups.c $(incdir)/missing.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_util.h $(top_builddir)/config.h \ - $(top_srcdir)/compat/stdbool.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/setgroups.c -sudo_conf.lo: $(srcdir)/sudo_conf.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ - $(incdir)/queue.h $(incdir)/secure_path.h $(incdir)/sudo_conf.h \ - $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ - $(incdir)/sudo_util.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/sudo_conf.c -sudo_debug.lo: $(srcdir)/sudo_debug.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/stdbool.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/sudo_debug.c -sudo_dso.lo: $(srcdir)/sudo_dso.c $(incdir)/missing.h $(incdir)/sudo_dso.h \ - $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/sudo_dso.c -sudo_printf.lo: $(srcdir)/sudo_printf.c $(incdir)/missing.h \ - $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ - $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/sudo_printf.c -term.lo: $(srcdir)/term.c $(incdir)/missing.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_util.h $(top_builddir)/config.h \ - $(top_srcdir)/compat/stdbool.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/term.c -ttysize.lo: $(srcdir)/ttysize.c $(incdir)/missing.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_util.h $(top_builddir)/config.h \ - $(top_srcdir)/compat/stdbool.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/ttysize.c diff --git a/compat/Makefile.in b/compat/Makefile.in deleted file mode 100644 index ca2b6c5ce..000000000 --- a/compat/Makefile.in +++ /dev/null @@ -1,244 +0,0 @@ -# -# Copyright (c) 2011-2014 Todd C. Miller -# -# Permission to use, copy, modify, and distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# @configure_input@ -# - -#### Start of system configuration section. #### - -srcdir = @srcdir@ -devdir = @devdir@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -incdir = $(top_srcdir)/include -cross_compiling = @CROSS_COMPILING@ - -# Where to install things... -prefix = @prefix@ -exec_prefix = @exec_prefix@ -bindir = @bindir@ -sbindir = @sbindir@ -sysconfdir = @sysconfdir@ -libexecdir = @libexecdir@ -datarootdir = @datarootdir@ -localstatedir = @localstatedir@ - -# Compiler & tools to use -CC = @CC@ -LIBTOOL = @LIBTOOL@ - -# C preprocessor flags -CPPFLAGS = -I$(incdir) -I$(top_builddir) -I$(top_srcdir) @CPPFLAGS@ - -# Usually -O and/or -g -CFLAGS = @CFLAGS@ - -# PIE flags -PIE_CFLAGS = @PIE_CFLAGS@ -PIE_LDFLAGS = @PIE_LDFLAGS@ - -# Stack smashing protection flags -SSP_CFLAGS = @SSP_CFLAGS@ -SSP_LDFLAGS = @SSP_LDFLAGS@ - -# cppcheck options, usually set in the top-level Makefile -CPPCHECK_OPTS = -q --force --enable=warning,performance,portability --suppress=constStatement --error-exitcode=1 --inline-suppr -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_HOST_NAME_MAX -U_POSIX_PATH_MAX - -# OS dependent defines -DEFS = @OSDEFS@ - -# Set to non-empty for development mode -DEVEL = @DEVEL@ - -#### End of system configuration section. #### - -SHELL = @SHELL@ - -TEST_PROGS = @COMPAT_TEST_PROGS@ - -LIBOBJDIR = - -LTLIBOBJS = @LTLIBOBJS@ - -all: libreplace.la - -Makefile: $(srcdir)/Makefile.in - (cd $(top_builddir) && ./config.status --file compat/Makefile) - -.SUFFIXES: .o .c .h .lo - -.c.o: - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $< - -.c.lo: - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $< - -libreplace.la: $(LTLIBOBJS) - $(LIBTOOL) --mode=link $(CC) -o $@ $(LTLIBOBJS) -no-install - -siglist.c: mksiglist - ./mksiglist > $@ - -signame.c: mksigname - ./mksigname > $@ - -mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/missing.h $(top_builddir)/config.h - $(CC) $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mksiglist.c -o $@ - -mksigname: $(srcdir)/mksigname.c $(srcdir)/mksigname.h $(incdir)/missing.h $(top_builddir)/config.h - $(CC) $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mksigname.c -o $@ - -fnm_test: fnm_test.o libreplace.la - $(LIBTOOL) --mode=link $(CC) -o $@ fnm_test.o libreplace.la $(PIE_LDFLAGS) $(SSP_LDFLAGS) - -globtest: globtest.o libreplace.la - $(LIBTOOL) --mode=link $(CC) -o $@ globtest.o libreplace.la $(PIE_LDFLAGS) $(SSP_LDFLAGS) - -$(srcdir)/mksiglist.h: $(srcdir)/siglist.in - @if [ -n "$(DEVEL)" ]; then \ - awk 'BEGIN {print "/* public domain */\n"} /^ [A-Z]/ {printf("#ifdef SIG%s\n if (sudo_sys_siglist[SIG%s] == NULL)\n\tsudo_sys_siglist[SIG%s] = \"%s\";\n#endif\n", $$1, $$1, $$1, substr($$0, 13))}' < $(srcdir)/siglist.in > $@; \ - fi - -$(srcdir)/mksigname.h: $(srcdir)/siglist.in - @if [ -n "$(DEVEL)" ]; then \ - awk 'BEGIN {print "/* public domain */\n"} /^ [A-Z]/ {printf("#ifdef SIG%s\n if (sudo_sys_signame[SIG%s] == NULL)\n\tsudo_sys_signame[SIG%s] = \"%s\";\n#endif\n", $$1, $$1, $$1, $$1)}' < $(srcdir)/siglist.in > $@; \ - fi - -pre-install: - -install: - -install-dirs: - -install-binaries: - -install-includes: - -install-doc: - -install-plugin: - -uninstall: - -cppcheck: - cppcheck $(CPPCHECK_OPTS) -I$(incdir) -I$(top_builddir) -I$(top_srcdir) $(srcdir)/*.c - -check: $(TEST_PROGS) - @if test X"$(cross_compiling)" != X"yes"; then \ - if test -f fnm_test; then \ - ./fnm_test $(srcdir)/regress/fnmatch/fnm_test.in; \ - fi; \ - if test -f globtest; then \ - mkdir -p `sed 's@/[^/]*$$@@' $(srcdir)/regress/glob/files | sort -u`; \ - touch `cat $(srcdir)/regress/glob/files`; \ - chmod 0755 `grep '/r[^/]*$$' $(srcdir)/regress/glob/files`; \ - chmod 0444 `grep '/s[^/]*$$' $(srcdir)/regress/glob/files`; \ - chmod 0711 `grep '/t[^/]*$$' $(srcdir)/regress/glob/files`; \ - ./globtest $(srcdir)/regress/glob/globtest.in; \ - rval=$$?; \ - rm -rf fake; \ - exit $$rval; \ - fi; \ - fi - -clean: - -$(LIBTOOL) --mode=clean rm -f $(TEST_PROGS) mksiglist mksigname siglist.c signame.c *.lo *.o *.la *.a stamp-* core *.core core.* - -mostlyclean: clean - -distclean: clean - -rm -rf Makefile .libs - -clobber: distclean - -realclean: distclean - rm -f TAGS tags - -cleandir: realclean - -# Autogenerated dependencies, do not modify -clock_gettime.lo: $(srcdir)/clock_gettime.c $(incdir)/missing.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/timespec.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/clock_gettime.c -closefrom.lo: $(srcdir)/closefrom.c $(incdir)/missing.h $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/closefrom.c -fnm_test.o: $(srcdir)/regress/fnmatch/fnm_test.c $(incdir)/missing.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/fnmatch.h - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/regress/fnmatch/fnm_test.c -fnmatch.lo: $(srcdir)/fnmatch.c $(incdir)/missing.h $(top_builddir)/config.h \ - $(top_srcdir)/compat/charclass.h $(top_srcdir)/compat/fnmatch.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/fnmatch.c -getaddrinfo.lo: $(srcdir)/getaddrinfo.c $(incdir)/missing.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/getaddrinfo.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/getaddrinfo.c -getcwd.lo: $(srcdir)/getcwd.c $(incdir)/missing.h $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/getcwd.c -getgrouplist.lo: $(srcdir)/getgrouplist.c $(incdir)/missing.h \ - $(incdir)/sudo_util.h $(top_builddir)/config.h \ - $(top_srcdir)/compat/nss_dbdefs.h \ - $(top_srcdir)/compat/stdbool.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/getgrouplist.c -getline.lo: $(srcdir)/getline.c $(incdir)/missing.h $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/getline.c -getopt_long.lo: $(srcdir)/getopt_long.c $(incdir)/fatal.h $(incdir)/missing.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/getopt.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/getopt_long.c -glob.lo: $(srcdir)/glob.c $(incdir)/missing.h $(top_builddir)/config.h \ - $(top_srcdir)/compat/charclass.h $(top_srcdir)/compat/glob.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/glob.c -globtest.o: $(srcdir)/regress/glob/globtest.c $(incdir)/missing.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/glob.h - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/regress/glob/globtest.c -isblank.lo: $(srcdir)/isblank.c $(incdir)/missing.h $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/isblank.c -memrchr.lo: $(srcdir)/memrchr.c $(incdir)/missing.h $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/memrchr.c -memset_s.lo: $(srcdir)/memset_s.c $(incdir)/missing.h $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/memset_s.c -mksiglist.lo: $(srcdir)/mksiglist.c $(incdir)/missing.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/mksiglist.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mksiglist.c -mksigname.lo: $(srcdir)/mksigname.c $(incdir)/missing.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/mksigname.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mksigname.c -mktemp.lo: $(srcdir)/mktemp.c $(incdir)/missing.h $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mktemp.c -pw_dup.lo: $(srcdir)/pw_dup.c $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/pw_dup.c -sha2.lo: $(srcdir)/sha2.c $(incdir)/missing.h $(top_builddir)/config.h \ - $(top_srcdir)/compat/endian.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/sha2.c -sig2str.lo: $(srcdir)/sig2str.c $(incdir)/missing.h $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/sig2str.c -siglist.lo: siglist.c $(incdir)/missing.h $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) siglist.c -signame.lo: signame.c $(incdir)/missing.h $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) signame.c -snprintf.lo: $(srcdir)/snprintf.c $(incdir)/missing.h $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/snprintf.c -strlcat.lo: $(srcdir)/strlcat.c $(incdir)/missing.h $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/strlcat.c -strlcpy.lo: $(srcdir)/strlcpy.c $(incdir)/missing.h $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/strlcpy.c -strsignal.lo: $(srcdir)/strsignal.c $(incdir)/gettext.h $(incdir)/missing.h \ - $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/strsignal.c -strtonum.lo: $(srcdir)/strtonum.c $(incdir)/gettext.h $(incdir)/missing.h \ - $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/strtonum.c -utimes.lo: $(srcdir)/utimes.c $(incdir)/missing.h $(top_builddir)/config.h \ - $(top_srcdir)/compat/utime.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/utimes.c diff --git a/configure b/configure index 8b6656979..c42d0daff 100755 --- a/configure +++ b/configure @@ -596,7 +596,7 @@ PACKAGE_BUGREPORT='http://www.sudo.ws/bugs/' PACKAGE_URL='' ac_unique_file="src/sudo.c" -ac_config_libobj_dir=compat +ac_config_libobj_dir=lib/util # Factoring default headers for most tests. ac_includes_default="\ #include @@ -736,7 +736,6 @@ LIBINTL LT_STATIC LIBDL CONFIGURE_ARGS -ac_config_libobj_dir LIBTOOL_DEPS ZLIB_SRC ZLIB @@ -2975,7 +2974,6 @@ $as_echo "$as_me: Configuring Sudo version $PACKAGE_VERSION" >&6;} - # @@ -19497,12 +19495,12 @@ esac if test X"$enable_zlib" = X"builtin"; then $as_echo "#define HAVE_ZLIB_H 1" >>confdefs.h - CPPFLAGS='-I$(top_builddir)/zlib -I$(top_srcdir)/zlib '"${CPPFLAGS}" - ZLIB="${ZLIB}"' $(top_builddir)/zlib/libz.la' - ZLIB_SRC=zlib - ac_config_headers="$ac_config_headers zlib/zconf.h" + CPPFLAGS='-I$(top_builddir)/lib/zlib -I$(top_srcdir)/lib/zlib '"${CPPFLAGS}" + ZLIB="${ZLIB}"' $(top_builddir)/lib/zlib/libz.la' + ZLIB_SRC=lib/zlib + ac_config_headers="$ac_config_headers lib/zlib/zconf.h" - ac_config_files="$ac_config_files zlib/Makefile" + ac_config_files="$ac_config_files lib/zlib/Makefile" fi @@ -22715,7 +22713,7 @@ test "$localedir" = '${datarootdir}/locale' && localedir='$(datarootdir)/locale' test "$localstatedir" = '${prefix}/var' && localstatedir='$(prefix)/var' test "$sysconfdir" = '${prefix}/etc' -a X"$with_stow" != X"yes" && sysconfdir='/etc' -ac_config_files="$ac_config_files Makefile common/Makefile compat/Makefile doc/Makefile include/Makefile init.d/aix.sh init.d/hpux.sh src/sudo_usage.h src/Makefile plugins/sample/Makefile plugins/group_file/Makefile plugins/system_group/Makefile plugins/sudoers/Makefile plugins/sudoers/sudoers" +ac_config_files="$ac_config_files Makefile doc/Makefile include/Makefile init.d/aix.sh init.d/hpux.sh lib/util/Makefile src/sudo_usage.h src/Makefile plugins/sample/Makefile plugins/group_file/Makefile plugins/system_group/Makefile plugins/sudoers/Makefile plugins/sudoers/sudoers" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -23700,15 +23698,14 @@ do "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "pathnames.h") CONFIG_HEADERS="$CONFIG_HEADERS pathnames.h" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "zlib/zconf.h") CONFIG_HEADERS="$CONFIG_HEADERS zlib/zconf.h" ;; - "zlib/Makefile") CONFIG_FILES="$CONFIG_FILES zlib/Makefile" ;; + "lib/zlib/zconf.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/zlib/zconf.h" ;; + "lib/zlib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/zlib/Makefile" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "common/Makefile") CONFIG_FILES="$CONFIG_FILES common/Makefile" ;; - "compat/Makefile") CONFIG_FILES="$CONFIG_FILES compat/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "init.d/aix.sh") CONFIG_FILES="$CONFIG_FILES init.d/aix.sh" ;; "init.d/hpux.sh") CONFIG_FILES="$CONFIG_FILES init.d/hpux.sh" ;; + "lib/util/Makefile") CONFIG_FILES="$CONFIG_FILES lib/util/Makefile" ;; "src/sudo_usage.h") CONFIG_FILES="$CONFIG_FILES src/sudo_usage.h" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "plugins/sample/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/sample/Makefile" ;; diff --git a/configure.ac b/configure.ac index 0285e2492..003d6770e 100644 --- a/configure.ac +++ b/configure.ac @@ -72,7 +72,6 @@ AC_SUBST([LOGINCAP_USAGE]) AC_SUBST([ZLIB]) AC_SUBST([ZLIB_SRC]) AC_SUBST([LIBTOOL_DEPS]) -AC_SUBST([ac_config_libobj_dir]) AC_SUBST([CONFIGURE_ARGS]) AC_SUBST([LIBDL]) AC_SUBST([LT_STATIC]) @@ -237,9 +236,9 @@ RTLD_PRELOAD_DELIM=":" RTLD_PRELOAD_DEFAULT= dnl -dnl libc replacement functions live in compat +dnl libc replacement functions live in libsudo_util.a dnl -AC_CONFIG_LIBOBJ_DIR(compat) +AC_CONFIG_LIBOBJ_DIR(lib/util) # # Prior to sudo 1.8.7, sudo stored libexec files in $libexecdir. @@ -2754,11 +2753,11 @@ case "$enable_zlib" in esac if test X"$enable_zlib" = X"builtin"; then AC_DEFINE(HAVE_ZLIB_H) - CPPFLAGS='-I$(top_builddir)/zlib -I$(top_srcdir)/zlib '"${CPPFLAGS}" - ZLIB="${ZLIB}"' $(top_builddir)/zlib/libz.la' - ZLIB_SRC=zlib - AC_CONFIG_HEADER([zlib/zconf.h]) - AC_CONFIG_FILES([zlib/Makefile]) + CPPFLAGS='-I$(top_builddir)/lib/zlib -I$(top_srcdir)/lib/zlib '"${CPPFLAGS}" + ZLIB="${ZLIB}"' $(top_builddir)/lib/zlib/libz.la' + ZLIB_SRC=lib/zlib + AC_CONFIG_HEADER([lib/zlib/zconf.h]) + AC_CONFIG_FILES([lib/zlib/Makefile]) fi dnl @@ -3833,7 +3832,7 @@ test "$sysconfdir" = '${prefix}/etc' -a X"$with_stow" != X"yes" && sysconfdir='/ dnl dnl Substitute into the Makefile and man pages dnl -AC_CONFIG_FILES([Makefile common/Makefile compat/Makefile doc/Makefile include/Makefile init.d/aix.sh init.d/hpux.sh src/sudo_usage.h src/Makefile plugins/sample/Makefile plugins/group_file/Makefile plugins/system_group/Makefile plugins/sudoers/Makefile plugins/sudoers/sudoers]) +AC_CONFIG_FILES([Makefile doc/Makefile include/Makefile init.d/aix.sh init.d/hpux.sh lib/util/Makefile src/sudo_usage.h src/Makefile plugins/sample/Makefile plugins/group_file/Makefile plugins/system_group/Makefile plugins/sudoers/Makefile plugins/sudoers/sudoers]) AC_OUTPUT dnl diff --git a/compat/charclass.h b/include/compat/charclass.h similarity index 100% rename from compat/charclass.h rename to include/compat/charclass.h diff --git a/compat/endian.h b/include/compat/endian.h similarity index 100% rename from compat/endian.h rename to include/compat/endian.h diff --git a/compat/fnmatch.h b/include/compat/fnmatch.h similarity index 100% rename from compat/fnmatch.h rename to include/compat/fnmatch.h diff --git a/compat/getaddrinfo.h b/include/compat/getaddrinfo.h similarity index 100% rename from compat/getaddrinfo.h rename to include/compat/getaddrinfo.h diff --git a/compat/getopt.h b/include/compat/getopt.h similarity index 100% rename from compat/getopt.h rename to include/compat/getopt.h diff --git a/compat/glob.h b/include/compat/glob.h similarity index 100% rename from compat/glob.h rename to include/compat/glob.h diff --git a/compat/mksiglist.h b/include/compat/mksiglist.h similarity index 100% rename from compat/mksiglist.h rename to include/compat/mksiglist.h diff --git a/compat/mksigname.h b/include/compat/mksigname.h similarity index 100% rename from compat/mksigname.h rename to include/compat/mksigname.h diff --git a/compat/nss_dbdefs.h b/include/compat/nss_dbdefs.h similarity index 100% rename from compat/nss_dbdefs.h rename to include/compat/nss_dbdefs.h diff --git a/compat/sha2.h b/include/compat/sha2.h similarity index 100% rename from compat/sha2.h rename to include/compat/sha2.h diff --git a/compat/stdbool.h b/include/compat/stdbool.h similarity index 100% rename from compat/stdbool.h rename to include/compat/stdbool.h diff --git a/compat/timespec.h b/include/compat/timespec.h similarity index 100% rename from compat/timespec.h rename to include/compat/timespec.h diff --git a/compat/utime.h b/include/compat/utime.h similarity index 100% rename from compat/utime.h rename to include/compat/utime.h diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in new file mode 100644 index 000000000..f12c3aae5 --- /dev/null +++ b/lib/util/Makefile.in @@ -0,0 +1,433 @@ +# +# Copyright (c) 2011-2014 Todd C. Miller +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# @configure_input@ +# + +#### Start of system configuration section. #### + +srcdir = @srcdir@ +devdir = @devdir@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +incdir = $(top_srcdir)/include +cross_compiling = @CROSS_COMPILING@ + +# Where to install things... +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +sbindir = @sbindir@ +sysconfdir = @sysconfdir@ +libexecdir = @libexecdir@ +datarootdir = @datarootdir@ +localstatedir = @localstatedir@ + +# Compiler & tools to use +CC = @CC@ +LIBTOOL = @LIBTOOL@ + +# C preprocessor flags +CPPFLAGS = -I$(incdir) -I$(top_builddir) -I$(top_srcdir) @CPPFLAGS@ + +# Usually -O and/or -g +CFLAGS = @CFLAGS@ + +# PIE flags +PIE_CFLAGS = @PIE_CFLAGS@ +PIE_LDFLAGS = @PIE_LDFLAGS@ + +# Stack smashing protection flags +SSP_CFLAGS = @SSP_CFLAGS@ +SSP_LDFLAGS = @SSP_LDFLAGS@ + +# cppcheck options, usually set in the top-level Makefile +CPPCHECK_OPTS = -q --force --enable=warning,performance,portability --suppress=constStatement --error-exitcode=1 --inline-suppr -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_HOST_NAME_MAX -U_POSIX_PATH_MAX + +# Regression tests +TEST_PROGS = atofoo_test conf_test hltq_test parseln_test @COMPAT_TEST_PROGS@ +TEST_LIBS = @LIBS@ @LIBINTL@ +TEST_LDFLAGS = @LDFLAGS@ + +# OS dependent defines +DEFS = @OSDEFS@ -D_PATH_SUDO_CONF=\"$(sysconfdir)/sudo.conf\" + +# Set to non-empty for development mode +DEVEL = @DEVEL@ + +#### End of system configuration section. #### + +SHELL = @SHELL@ + +LTOBJS = alloc.lo atobool.lo atoid.lo atomode.lo event.lo fatal.lo fileops.lo \ + fmt_string.lo gidlist.lo lbuf.lo progname.lo secure_path.lo \ + setgroups.lo sudo_conf.lo sudo_debug.lo sudo_dso.lo sudo_printf.lo \ + term.lo ttysize.lo @COMMON_OBJS@ @LTLIBOBJS@ + +ATOFOO_TEST_OBJS = atofoo_test.lo locale_stub.lo + +PARSELN_TEST_OBJS = parseln_test.lo locale_stub.lo + +CONF_TEST_OBJS = conf_test.lo locale_stub.lo + +HLTQ_TEST_OBJS = hltq_test.lo locale_stub.lo + +all: libsudo_util.la + +Makefile: $(srcdir)/Makefile.in + (cd $(top_builddir) && ./config.status --file lib/util/Makefile) + +.SUFFIXES: .o .c .h .lo + +.c.o: + $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $< + +.c.lo: + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $< + +libsudo_util.la: $(LTOBJS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(LTOBJS) -no-install + +siglist.c: mksiglist + ./mksiglist > $@ + +signame.c: mksigname + ./mksigname > $@ + +mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/missing.h $(top_builddir)/config.h + $(CC) $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mksiglist.c -o $@ + +mksigname: $(srcdir)/mksigname.c $(srcdir)/mksigname.h $(incdir)/missing.h $(top_builddir)/config.h + $(CC) $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mksigname.c -o $@ + +fnm_test: fnm_test.o libsudo_util.la + $(LIBTOOL) --mode=link $(CC) -o $@ fnm_test.o libsudo_util.la $(PIE_LDFLAGS) $(SSP_LDFLAGS) + +globtest: globtest.o libsudo_util.la + $(LIBTOOL) --mode=link $(CC) -o $@ globtest.o libsudo_util.la $(PIE_LDFLAGS) $(SSP_LDFLAGS) + +$(srcdir)/mksiglist.h: $(srcdir)/siglist.in + @if [ -n "$(DEVEL)" ]; then \ + awk 'BEGIN {print "/* public domain */\n"} /^ [A-Z]/ {printf("#ifdef SIG%s\n if (sudo_sys_siglist[SIG%s] == NULL)\n\tsudo_sys_siglist[SIG%s] = \"%s\";\n#endif\n", $$1, $$1, $$1, substr($$0, 13))}' < $(srcdir)/siglist.in > $@; \ + fi + +$(srcdir)/mksigname.h: $(srcdir)/siglist.in + @if [ -n "$(DEVEL)" ]; then \ + awk 'BEGIN {print "/* public domain */\n"} /^ [A-Z]/ {printf("#ifdef SIG%s\n if (sudo_sys_signame[SIG%s] == NULL)\n\tsudo_sys_signame[SIG%s] = \"%s\";\n#endif\n", $$1, $$1, $$1, $$1)}' < $(srcdir)/siglist.in > $@; \ + fi + +atofoo_test: $(ATOFOO_TEST_OBJS) libsudo_util.la + $(LIBTOOL) --mode=link $(CC) -o $@ $(ATOFOO_TEST_OBJS) libsudo_util.la $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS) + +conf_test: $(CONF_TEST_OBJS) libsudo_util.la + $(LIBTOOL) --mode=link $(CC) -o $@ $(CONF_TEST_OBJS) libsudo_util.la $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS) + +parseln_test: $(PARSELN_TEST_OBJS) libsudo_util.la + $(LIBTOOL) --mode=link $(CC) -o $@ $(PARSELN_TEST_OBJS) libsudo_util.la $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS) + +hltq_test: $(HLTQ_TEST_OBJS) libsudo_util.la + $(LIBTOOL) --mode=link $(CC) -o $@ $(HLTQ_TEST_OBJS) libsudo_util.la $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS) + +pre-install: + +install: + +install-dirs: + +install-binaries: + +install-includes: + +install-doc: + +install-plugin: + +uninstall: + +cppcheck: + cppcheck $(CPPCHECK_OPTS) -I$(incdir) -I$(top_builddir) -I$(top_srcdir) $(srcdir)/*.c + +# Note: some regress checks are run from srcdir for consistent error messages +check: $(TEST_PROGS) + @if test X"$(cross_compiling)" != X"yes"; then \ + rval=0; \ + if test -f fnm_test; then \ + ./fnm_test $(srcdir)/regress/fnmatch/fnm_test.in || rval=`expr $$rval + $$?`; \ + fi; \ + if test -f globtest; then \ + mkdir -p `sed 's@/[^/]*$$@@' $(srcdir)/regress/glob/files | sort -u`; \ + touch `cat $(srcdir)/regress/glob/files`; \ + chmod 0755 `grep '/r[^/]*$$' $(srcdir)/regress/glob/files`; \ + chmod 0444 `grep '/s[^/]*$$' $(srcdir)/regress/glob/files`; \ + chmod 0711 `grep '/t[^/]*$$' $(srcdir)/regress/glob/files`; \ + ./globtest $(srcdir)/regress/glob/globtest.in || rval=`expr $$rval + $$?`; \ + rm -rf fake; \ + fi; \ + ./atofoo_test || rval=`expr $$rval + $$?`; \ + ./hltq_test || rval=`expr $$rval + $$?`; \ + build_dir=`pwd`; \ + cd $(srcdir); \ + for dir in sudo_conf sudo_parseln; do \ + passed=0; failed=0; total=0; \ + mkdir -p $$build_dir/regress/$$dir; \ + for t in regress/$$dir/*.in; do \ + base=`basename $$t .in`; \ + out="$$build_dir/regress/$$dir/$${base}.out"; \ + out_ok="regress/$$dir/$${base}.out.ok"; \ + err="$$build_dir/regress/$$dir/$${base}.err"; \ + err_ok="regress/$$dir/$${base}.err.ok"; \ + if test "$$dir" = "sudo_conf"; then \ + $$build_dir/conf_test $$t >$$out 2>$$err; \ + else \ + $$build_dir/parseln_test <$$t >$$out 2>$$err; \ + fi; \ + if cmp $$out $$out_ok >/dev/null; then \ + passed=`expr $$passed + 1`; \ + echo "$$dir/$$base: OK"; \ + else \ + failed=`expr $$failed + 1`; \ + echo "$$dir/$$base: FAIL"; \ + diff $$out $$out_ok || true; \ + fi; \ + total=`expr $$total + 1`; \ + if test -s $$err_ok; then \ + if cmp $$err $$err_ok >/dev/null; then \ + passed=`expr $$passed + 1`; \ + echo "$$dir/$$base (stderr): OK"; \ + else \ + failed=`expr $$failed + 1`; \ + echo "$$dir/$$base (stderr): FAIL"; \ + diff $$err $$err_ok || true; \ + fi; \ + total=`expr $$total + 1`; \ + elif test -s $$err; then \ + failed=`expr $$failed + 1`; \ + echo "$$dir/$$base (stderr): FAIL"; \ + cat $$err 1>&2; \ + fi; \ + done; \ + if test $$failed -ne 0; then \ + rval=`expr $$rval + $$failed`; \ + fi; \ + echo "$$dir: $$passed/$$total tests passed; $$failed/$$total tests failed"; \ + done; \ + exit $$rval; \ + fi + +clean: + -$(LIBTOOL) --mode=clean rm -f $(TEST_PROGS) *.lo *.o *.la *.a stamp-* core *.core core.* regress/*/*.out + +mostlyclean: clean + +distclean: clean + -rm -rf Makefile .libs + +clobber: distclean + +realclean: distclean + rm -f TAGS tags + +cleandir: realclean + +# Autogenerated dependencies, do not modify +aix.lo: $(srcdir)/aix.c $(incdir)/alloc.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/gettext.h $(incdir)/missing.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_util.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/aix.c +alloc.lo: $(srcdir)/alloc.c $(incdir)/alloc.h $(incdir)/fatal.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/alloc.c +atobool.lo: $(srcdir)/atobool.c $(incdir)/compat/stdbool.h $(incdir)/missing.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_util.h \ + $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/atobool.c +atofoo_test.lo: $(srcdir)/regress/atofoo/atofoo_test.c \ + $(incdir)/compat/stdbool.h $(incdir)/fatal.h \ + $(incdir)/missing.h $(incdir)/sudo_util.h \ + $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/regress/atofoo/atofoo_test.c +atoid.lo: $(srcdir)/atoid.c $(incdir)/compat/stdbool.h $(incdir)/gettext.h \ + $(incdir)/missing.h $(incdir)/sudo_debug.h $(incdir)/sudo_util.h \ + $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/atoid.c +atomode.lo: $(srcdir)/atomode.c $(incdir)/compat/stdbool.h $(incdir)/gettext.h \ + $(incdir)/missing.h $(incdir)/sudo_debug.h $(incdir)/sudo_util.h \ + $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/atomode.c +clock_gettime.lo: $(srcdir)/clock_gettime.c $(incdir)/compat/timespec.h \ + $(incdir)/missing.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/clock_gettime.c +closefrom.lo: $(srcdir)/closefrom.c $(incdir)/missing.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/closefrom.c +conf_test.lo: $(srcdir)/regress/sudo_conf/conf_test.c \ + $(incdir)/compat/stdbool.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_conf.h $(incdir)/sudo_util.h \ + $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/regress/sudo_conf/conf_test.c +event.lo: $(srcdir)/event.c $(incdir)/alloc.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_event.h $(incdir)/sudo_util.h \ + $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/event.c +event_poll.lo: $(srcdir)/event_poll.c $(incdir)/alloc.h \ + $(incdir)/compat/stdbool.h $(incdir)/fatal.h \ + $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ + $(incdir)/sudo_event.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/event_poll.c +event_select.lo: $(srcdir)/event_select.c $(incdir)/alloc.h \ + $(incdir)/compat/stdbool.h $(incdir)/fatal.h \ + $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ + $(incdir)/sudo_event.h $(incdir)/sudo_util.h \ + $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/event_select.c +fatal.lo: $(srcdir)/fatal.c $(incdir)/alloc.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/gettext.h $(incdir)/missing.h \ + $(incdir)/queue.h $(incdir)/sudo_plugin.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/fatal.c +fileops.lo: $(srcdir)/fileops.c $(incdir)/compat/stdbool.h \ + $(incdir)/compat/timespec.h $(incdir)/fileops.h \ + $(incdir)/missing.h $(incdir)/sudo_debug.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/fileops.c +fmt_string.lo: $(srcdir)/fmt_string.c $(incdir)/compat/stdbool.h \ + $(incdir)/missing.h $(incdir)/sudo_debug.h \ + $(incdir)/sudo_util.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/fmt_string.c +fnm_test.o: $(srcdir)/regress/fnmatch/fnm_test.c $(incdir)/compat/fnmatch.h \ + $(incdir)/missing.h $(top_builddir)/config.h + $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/regress/fnmatch/fnm_test.c +fnmatch.lo: $(srcdir)/fnmatch.c $(incdir)/compat/charclass.h \ + $(incdir)/compat/fnmatch.h $(incdir)/missing.h \ + $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/fnmatch.c +getaddrinfo.lo: $(srcdir)/getaddrinfo.c $(incdir)/compat/getaddrinfo.h \ + $(incdir)/missing.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/getaddrinfo.c +getcwd.lo: $(srcdir)/getcwd.c $(incdir)/missing.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/getcwd.c +getgrouplist.lo: $(srcdir)/getgrouplist.c $(incdir)/compat/nss_dbdefs.h \ + $(incdir)/compat/stdbool.h $(incdir)/missing.h \ + $(incdir)/sudo_util.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/getgrouplist.c +getline.lo: $(srcdir)/getline.c $(incdir)/missing.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/getline.c +getopt_long.lo: $(srcdir)/getopt_long.c $(incdir)/compat/getopt.h \ + $(incdir)/fatal.h $(incdir)/missing.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/getopt_long.c +gidlist.lo: $(srcdir)/gidlist.c $(incdir)/alloc.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/gettext.h $(incdir)/missing.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_util.h \ + $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/gidlist.c +glob.lo: $(srcdir)/glob.c $(incdir)/compat/charclass.h $(incdir)/compat/glob.h \ + $(incdir)/missing.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/glob.c +globtest.o: $(srcdir)/regress/glob/globtest.c $(incdir)/compat/glob.h \ + $(incdir)/missing.h $(top_builddir)/config.h + $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/regress/glob/globtest.c +hltq_test.lo: $(srcdir)/regress/tailq/hltq_test.c $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_util.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/regress/tailq/hltq_test.c +isblank.lo: $(srcdir)/isblank.c $(incdir)/missing.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/isblank.c +lbuf.lo: $(srcdir)/lbuf.c $(incdir)/alloc.h $(incdir)/fatal.h $(incdir)/lbuf.h \ + $(incdir)/missing.h $(incdir)/sudo_debug.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/lbuf.c +locale_stub.lo: $(top_srcdir)/src/locale_stub.c $(incdir)/fatal.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(top_srcdir)/src/locale_stub.c +memrchr.lo: $(srcdir)/memrchr.c $(incdir)/missing.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/memrchr.c +memset_s.lo: $(srcdir)/memset_s.c $(incdir)/missing.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/memset_s.c +mksiglist.lo: $(srcdir)/mksiglist.c $(incdir)/compat/mksiglist.h \ + $(incdir)/missing.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mksiglist.c +mksigname.lo: $(srcdir)/mksigname.c $(incdir)/compat/mksigname.h \ + $(incdir)/missing.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mksigname.c +mktemp.lo: $(srcdir)/mktemp.c $(incdir)/missing.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mktemp.c +parseln_test.lo: $(srcdir)/regress/sudo_parseln/parseln_test.c \ + $(incdir)/compat/stdbool.h $(incdir)/fileops.h \ + $(incdir)/missing.h $(incdir)/sudo_util.h \ + $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/regress/sudo_parseln/parseln_test.c +progname.lo: $(srcdir)/progname.c $(incdir)/compat/stdbool.h \ + $(incdir)/missing.h $(incdir)/sudo_util.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/progname.c +pw_dup.lo: $(srcdir)/pw_dup.c $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/pw_dup.c +secure_path.lo: $(srcdir)/secure_path.c $(incdir)/missing.h \ + $(incdir)/secure_path.h $(incdir)/sudo_debug.h \ + $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/secure_path.c +setgroups.lo: $(srcdir)/setgroups.c $(incdir)/compat/stdbool.h \ + $(incdir)/missing.h $(incdir)/sudo_debug.h $(incdir)/sudo_util.h \ + $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/setgroups.c +sha2.lo: $(srcdir)/sha2.c $(incdir)/compat/endian.h $(incdir)/compat/sha2.h \ + $(incdir)/missing.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/sha2.c +sig2str.lo: $(srcdir)/sig2str.c $(incdir)/missing.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/sig2str.c +siglist.lo: siglist.c $(incdir)/missing.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) siglist.c +signame.lo: signame.c $(incdir)/missing.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) signame.c +snprintf.lo: $(srcdir)/snprintf.c $(incdir)/missing.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/snprintf.c +strlcat.lo: $(srcdir)/strlcat.c $(incdir)/missing.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/strlcat.c +strlcpy.lo: $(srcdir)/strlcpy.c $(incdir)/missing.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/strlcpy.c +strsignal.lo: $(srcdir)/strsignal.c $(incdir)/gettext.h $(incdir)/missing.h \ + $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/strsignal.c +strtonum.lo: $(srcdir)/strtonum.c $(incdir)/gettext.h $(incdir)/missing.h \ + $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/strtonum.c +sudo_conf.lo: $(srcdir)/sudo_conf.c $(incdir)/alloc.h \ + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/secure_path.h $(incdir)/sudo_conf.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/sudo_conf.c +sudo_debug.lo: $(srcdir)/sudo_debug.c $(incdir)/alloc.h \ + $(incdir)/compat/stdbool.h $(incdir)/fatal.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/sudo_debug.h \ + $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ + $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/sudo_debug.c +sudo_dso.lo: $(srcdir)/sudo_dso.c $(incdir)/missing.h $(incdir)/sudo_dso.h \ + $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/sudo_dso.c +sudo_printf.lo: $(srcdir)/sudo_printf.c $(incdir)/missing.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/sudo_printf.c +term.lo: $(srcdir)/term.c $(incdir)/compat/stdbool.h $(incdir)/missing.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_util.h $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/term.c +ttysize.lo: $(srcdir)/ttysize.c $(incdir)/compat/stdbool.h $(incdir)/missing.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_util.h \ + $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/ttysize.c +utimes.lo: $(srcdir)/utimes.c $(incdir)/compat/utime.h $(incdir)/missing.h \ + $(top_builddir)/config.h + $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/utimes.c diff --git a/common/aix.c b/lib/util/aix.c similarity index 100% rename from common/aix.c rename to lib/util/aix.c diff --git a/common/alloc.c b/lib/util/alloc.c similarity index 100% rename from common/alloc.c rename to lib/util/alloc.c diff --git a/common/atobool.c b/lib/util/atobool.c similarity index 100% rename from common/atobool.c rename to lib/util/atobool.c diff --git a/common/atoid.c b/lib/util/atoid.c similarity index 100% rename from common/atoid.c rename to lib/util/atoid.c diff --git a/common/atomode.c b/lib/util/atomode.c similarity index 100% rename from common/atomode.c rename to lib/util/atomode.c diff --git a/compat/clock_gettime.c b/lib/util/clock_gettime.c similarity index 100% rename from compat/clock_gettime.c rename to lib/util/clock_gettime.c diff --git a/compat/closefrom.c b/lib/util/closefrom.c similarity index 100% rename from compat/closefrom.c rename to lib/util/closefrom.c diff --git a/common/event.c b/lib/util/event.c similarity index 100% rename from common/event.c rename to lib/util/event.c diff --git a/common/event_poll.c b/lib/util/event_poll.c similarity index 100% rename from common/event_poll.c rename to lib/util/event_poll.c diff --git a/common/event_select.c b/lib/util/event_select.c similarity index 100% rename from common/event_select.c rename to lib/util/event_select.c diff --git a/common/fatal.c b/lib/util/fatal.c similarity index 100% rename from common/fatal.c rename to lib/util/fatal.c diff --git a/common/fileops.c b/lib/util/fileops.c similarity index 100% rename from common/fileops.c rename to lib/util/fileops.c diff --git a/common/fmt_string.c b/lib/util/fmt_string.c similarity index 100% rename from common/fmt_string.c rename to lib/util/fmt_string.c diff --git a/compat/fnmatch.c b/lib/util/fnmatch.c similarity index 100% rename from compat/fnmatch.c rename to lib/util/fnmatch.c diff --git a/compat/getaddrinfo.c b/lib/util/getaddrinfo.c similarity index 100% rename from compat/getaddrinfo.c rename to lib/util/getaddrinfo.c diff --git a/compat/getcwd.c b/lib/util/getcwd.c similarity index 100% rename from compat/getcwd.c rename to lib/util/getcwd.c diff --git a/compat/getgrouplist.c b/lib/util/getgrouplist.c similarity index 100% rename from compat/getgrouplist.c rename to lib/util/getgrouplist.c diff --git a/compat/getline.c b/lib/util/getline.c similarity index 100% rename from compat/getline.c rename to lib/util/getline.c diff --git a/compat/getopt_long.c b/lib/util/getopt_long.c similarity index 100% rename from compat/getopt_long.c rename to lib/util/getopt_long.c diff --git a/common/gidlist.c b/lib/util/gidlist.c similarity index 100% rename from common/gidlist.c rename to lib/util/gidlist.c diff --git a/compat/glob.c b/lib/util/glob.c similarity index 100% rename from compat/glob.c rename to lib/util/glob.c diff --git a/compat/inet_pton.c b/lib/util/inet_pton.c similarity index 100% rename from compat/inet_pton.c rename to lib/util/inet_pton.c diff --git a/compat/isblank.c b/lib/util/isblank.c similarity index 100% rename from compat/isblank.c rename to lib/util/isblank.c diff --git a/common/lbuf.c b/lib/util/lbuf.c similarity index 100% rename from common/lbuf.c rename to lib/util/lbuf.c diff --git a/compat/memrchr.c b/lib/util/memrchr.c similarity index 100% rename from compat/memrchr.c rename to lib/util/memrchr.c diff --git a/compat/memset_s.c b/lib/util/memset_s.c similarity index 100% rename from compat/memset_s.c rename to lib/util/memset_s.c diff --git a/compat/mksiglist.c b/lib/util/mksiglist.c similarity index 100% rename from compat/mksiglist.c rename to lib/util/mksiglist.c diff --git a/compat/mksigname.c b/lib/util/mksigname.c similarity index 100% rename from compat/mksigname.c rename to lib/util/mksigname.c diff --git a/compat/mktemp.c b/lib/util/mktemp.c similarity index 100% rename from compat/mktemp.c rename to lib/util/mktemp.c diff --git a/common/progname.c b/lib/util/progname.c similarity index 100% rename from common/progname.c rename to lib/util/progname.c diff --git a/compat/pw_dup.c b/lib/util/pw_dup.c similarity index 100% rename from compat/pw_dup.c rename to lib/util/pw_dup.c diff --git a/common/regress/atofoo/atofoo_test.c b/lib/util/regress/atofoo/atofoo_test.c similarity index 100% rename from common/regress/atofoo/atofoo_test.c rename to lib/util/regress/atofoo/atofoo_test.c diff --git a/compat/regress/fnmatch/fnm_test.c b/lib/util/regress/fnmatch/fnm_test.c similarity index 100% rename from compat/regress/fnmatch/fnm_test.c rename to lib/util/regress/fnmatch/fnm_test.c diff --git a/compat/regress/fnmatch/fnm_test.in b/lib/util/regress/fnmatch/fnm_test.in similarity index 100% rename from compat/regress/fnmatch/fnm_test.in rename to lib/util/regress/fnmatch/fnm_test.in diff --git a/compat/regress/glob/files b/lib/util/regress/glob/files similarity index 100% rename from compat/regress/glob/files rename to lib/util/regress/glob/files diff --git a/compat/regress/glob/globtest.c b/lib/util/regress/glob/globtest.c similarity index 100% rename from compat/regress/glob/globtest.c rename to lib/util/regress/glob/globtest.c diff --git a/compat/regress/glob/globtest.in b/lib/util/regress/glob/globtest.in similarity index 100% rename from compat/regress/glob/globtest.in rename to lib/util/regress/glob/globtest.in diff --git a/common/regress/sudo_conf/conf_test.c b/lib/util/regress/sudo_conf/conf_test.c similarity index 100% rename from common/regress/sudo_conf/conf_test.c rename to lib/util/regress/sudo_conf/conf_test.c diff --git a/common/regress/sudo_conf/test1.in b/lib/util/regress/sudo_conf/test1.in similarity index 100% rename from common/regress/sudo_conf/test1.in rename to lib/util/regress/sudo_conf/test1.in diff --git a/common/regress/sudo_conf/test1.out.ok b/lib/util/regress/sudo_conf/test1.out.ok similarity index 100% rename from common/regress/sudo_conf/test1.out.ok rename to lib/util/regress/sudo_conf/test1.out.ok diff --git a/common/regress/sudo_conf/test2.in b/lib/util/regress/sudo_conf/test2.in similarity index 100% rename from common/regress/sudo_conf/test2.in rename to lib/util/regress/sudo_conf/test2.in diff --git a/common/regress/sudo_conf/test2.out.ok b/lib/util/regress/sudo_conf/test2.out.ok similarity index 100% rename from common/regress/sudo_conf/test2.out.ok rename to lib/util/regress/sudo_conf/test2.out.ok diff --git a/common/regress/sudo_conf/test3.in b/lib/util/regress/sudo_conf/test3.in similarity index 100% rename from common/regress/sudo_conf/test3.in rename to lib/util/regress/sudo_conf/test3.in diff --git a/common/regress/sudo_conf/test3.out.ok b/lib/util/regress/sudo_conf/test3.out.ok similarity index 100% rename from common/regress/sudo_conf/test3.out.ok rename to lib/util/regress/sudo_conf/test3.out.ok diff --git a/common/regress/sudo_conf/test4.in b/lib/util/regress/sudo_conf/test4.in similarity index 100% rename from common/regress/sudo_conf/test4.in rename to lib/util/regress/sudo_conf/test4.in diff --git a/common/regress/sudo_conf/test4.out.ok b/lib/util/regress/sudo_conf/test4.out.ok similarity index 100% rename from common/regress/sudo_conf/test4.out.ok rename to lib/util/regress/sudo_conf/test4.out.ok diff --git a/common/regress/sudo_conf/test5.err.ok b/lib/util/regress/sudo_conf/test5.err.ok similarity index 100% rename from common/regress/sudo_conf/test5.err.ok rename to lib/util/regress/sudo_conf/test5.err.ok diff --git a/common/regress/sudo_conf/test5.in b/lib/util/regress/sudo_conf/test5.in similarity index 100% rename from common/regress/sudo_conf/test5.in rename to lib/util/regress/sudo_conf/test5.in diff --git a/common/regress/sudo_conf/test5.out.ok b/lib/util/regress/sudo_conf/test5.out.ok similarity index 100% rename from common/regress/sudo_conf/test5.out.ok rename to lib/util/regress/sudo_conf/test5.out.ok diff --git a/common/regress/sudo_conf/test6.in b/lib/util/regress/sudo_conf/test6.in similarity index 100% rename from common/regress/sudo_conf/test6.in rename to lib/util/regress/sudo_conf/test6.in diff --git a/common/regress/sudo_conf/test6.out.ok b/lib/util/regress/sudo_conf/test6.out.ok similarity index 100% rename from common/regress/sudo_conf/test6.out.ok rename to lib/util/regress/sudo_conf/test6.out.ok diff --git a/common/regress/sudo_parseln/parseln_test.c b/lib/util/regress/sudo_parseln/parseln_test.c similarity index 100% rename from common/regress/sudo_parseln/parseln_test.c rename to lib/util/regress/sudo_parseln/parseln_test.c diff --git a/common/regress/sudo_parseln/test1.in b/lib/util/regress/sudo_parseln/test1.in similarity index 100% rename from common/regress/sudo_parseln/test1.in rename to lib/util/regress/sudo_parseln/test1.in diff --git a/common/regress/sudo_parseln/test1.out.ok b/lib/util/regress/sudo_parseln/test1.out.ok similarity index 100% rename from common/regress/sudo_parseln/test1.out.ok rename to lib/util/regress/sudo_parseln/test1.out.ok diff --git a/common/regress/sudo_parseln/test2.in b/lib/util/regress/sudo_parseln/test2.in similarity index 100% rename from common/regress/sudo_parseln/test2.in rename to lib/util/regress/sudo_parseln/test2.in diff --git a/common/regress/sudo_parseln/test2.out.ok b/lib/util/regress/sudo_parseln/test2.out.ok similarity index 100% rename from common/regress/sudo_parseln/test2.out.ok rename to lib/util/regress/sudo_parseln/test2.out.ok diff --git a/common/regress/sudo_parseln/test3.in b/lib/util/regress/sudo_parseln/test3.in similarity index 100% rename from common/regress/sudo_parseln/test3.in rename to lib/util/regress/sudo_parseln/test3.in diff --git a/common/regress/sudo_parseln/test3.out.ok b/lib/util/regress/sudo_parseln/test3.out.ok similarity index 100% rename from common/regress/sudo_parseln/test3.out.ok rename to lib/util/regress/sudo_parseln/test3.out.ok diff --git a/common/regress/sudo_parseln/test4.in b/lib/util/regress/sudo_parseln/test4.in similarity index 100% rename from common/regress/sudo_parseln/test4.in rename to lib/util/regress/sudo_parseln/test4.in diff --git a/common/regress/sudo_parseln/test4.out.ok b/lib/util/regress/sudo_parseln/test4.out.ok similarity index 100% rename from common/regress/sudo_parseln/test4.out.ok rename to lib/util/regress/sudo_parseln/test4.out.ok diff --git a/common/regress/sudo_parseln/test5.in b/lib/util/regress/sudo_parseln/test5.in similarity index 100% rename from common/regress/sudo_parseln/test5.in rename to lib/util/regress/sudo_parseln/test5.in diff --git a/common/regress/sudo_parseln/test5.out.ok b/lib/util/regress/sudo_parseln/test5.out.ok similarity index 100% rename from common/regress/sudo_parseln/test5.out.ok rename to lib/util/regress/sudo_parseln/test5.out.ok diff --git a/common/regress/sudo_parseln/test6.in b/lib/util/regress/sudo_parseln/test6.in similarity index 100% rename from common/regress/sudo_parseln/test6.in rename to lib/util/regress/sudo_parseln/test6.in diff --git a/common/regress/sudo_parseln/test6.out.ok b/lib/util/regress/sudo_parseln/test6.out.ok similarity index 100% rename from common/regress/sudo_parseln/test6.out.ok rename to lib/util/regress/sudo_parseln/test6.out.ok diff --git a/common/regress/tailq/hltq_test.c b/lib/util/regress/tailq/hltq_test.c similarity index 100% rename from common/regress/tailq/hltq_test.c rename to lib/util/regress/tailq/hltq_test.c diff --git a/common/secure_path.c b/lib/util/secure_path.c similarity index 100% rename from common/secure_path.c rename to lib/util/secure_path.c diff --git a/common/setgroups.c b/lib/util/setgroups.c similarity index 100% rename from common/setgroups.c rename to lib/util/setgroups.c diff --git a/compat/sha2.c b/lib/util/sha2.c similarity index 99% rename from compat/sha2.c rename to lib/util/sha2.c index 45f21d87b..6d715b9aa 100644 --- a/compat/sha2.c +++ b/lib/util/sha2.c @@ -59,7 +59,7 @@ #endif #include "missing.h" -#include "sha2.h" +#include "compat/sha2.h" /* * SHA-2 operates on 32-bit and 64-bit words in big endian byte order. diff --git a/compat/sig2str.c b/lib/util/sig2str.c similarity index 100% rename from compat/sig2str.c rename to lib/util/sig2str.c diff --git a/compat/siglist.in b/lib/util/siglist.in similarity index 100% rename from compat/siglist.in rename to lib/util/siglist.in diff --git a/compat/snprintf.c b/lib/util/snprintf.c similarity index 100% rename from compat/snprintf.c rename to lib/util/snprintf.c diff --git a/compat/strlcat.c b/lib/util/strlcat.c similarity index 100% rename from compat/strlcat.c rename to lib/util/strlcat.c diff --git a/compat/strlcpy.c b/lib/util/strlcpy.c similarity index 100% rename from compat/strlcpy.c rename to lib/util/strlcpy.c diff --git a/compat/strsignal.c b/lib/util/strsignal.c similarity index 100% rename from compat/strsignal.c rename to lib/util/strsignal.c diff --git a/compat/strtonum.c b/lib/util/strtonum.c similarity index 100% rename from compat/strtonum.c rename to lib/util/strtonum.c diff --git a/common/sudo_conf.c b/lib/util/sudo_conf.c similarity index 100% rename from common/sudo_conf.c rename to lib/util/sudo_conf.c diff --git a/common/sudo_debug.c b/lib/util/sudo_debug.c similarity index 100% rename from common/sudo_debug.c rename to lib/util/sudo_debug.c diff --git a/common/sudo_dso.c b/lib/util/sudo_dso.c similarity index 100% rename from common/sudo_dso.c rename to lib/util/sudo_dso.c diff --git a/common/sudo_printf.c b/lib/util/sudo_printf.c similarity index 100% rename from common/sudo_printf.c rename to lib/util/sudo_printf.c diff --git a/common/term.c b/lib/util/term.c similarity index 100% rename from common/term.c rename to lib/util/term.c diff --git a/common/ttysize.c b/lib/util/ttysize.c similarity index 100% rename from common/ttysize.c rename to lib/util/ttysize.c diff --git a/compat/utimes.c b/lib/util/utimes.c similarity index 100% rename from compat/utimes.c rename to lib/util/utimes.c diff --git a/zlib/Makefile.in b/lib/zlib/Makefile.in similarity index 98% rename from zlib/Makefile.in rename to lib/zlib/Makefile.in index cbc0ee017..38b51ff1f 100644 --- a/zlib/Makefile.in +++ b/lib/zlib/Makefile.in @@ -48,7 +48,7 @@ LTOBJS = adler32.lo compress.lo crc32.lo deflate.lo gzclose.lo gzlib.lo \ all: libz.la Makefile: $(srcdir)/Makefile.in - (cd $(top_builddir) && ./config.status --file zlib/Makefile) + (cd $(top_builddir) && ./config.status --file lib/zlib/Makefile) .SUFFIXES: .c .h .lo diff --git a/zlib/adler32.c b/lib/zlib/adler32.c similarity index 100% rename from zlib/adler32.c rename to lib/zlib/adler32.c diff --git a/zlib/compress.c b/lib/zlib/compress.c similarity index 100% rename from zlib/compress.c rename to lib/zlib/compress.c diff --git a/zlib/crc32.c b/lib/zlib/crc32.c similarity index 100% rename from zlib/crc32.c rename to lib/zlib/crc32.c diff --git a/zlib/crc32.h b/lib/zlib/crc32.h similarity index 100% rename from zlib/crc32.h rename to lib/zlib/crc32.h diff --git a/zlib/deflate.c b/lib/zlib/deflate.c similarity index 100% rename from zlib/deflate.c rename to lib/zlib/deflate.c diff --git a/zlib/deflate.h b/lib/zlib/deflate.h similarity index 100% rename from zlib/deflate.h rename to lib/zlib/deflate.h diff --git a/zlib/gzclose.c b/lib/zlib/gzclose.c similarity index 100% rename from zlib/gzclose.c rename to lib/zlib/gzclose.c diff --git a/zlib/gzguts.h b/lib/zlib/gzguts.h similarity index 100% rename from zlib/gzguts.h rename to lib/zlib/gzguts.h diff --git a/zlib/gzlib.c b/lib/zlib/gzlib.c similarity index 100% rename from zlib/gzlib.c rename to lib/zlib/gzlib.c diff --git a/zlib/gzread.c b/lib/zlib/gzread.c similarity index 100% rename from zlib/gzread.c rename to lib/zlib/gzread.c diff --git a/zlib/gzwrite.c b/lib/zlib/gzwrite.c similarity index 100% rename from zlib/gzwrite.c rename to lib/zlib/gzwrite.c diff --git a/zlib/infback.c b/lib/zlib/infback.c similarity index 100% rename from zlib/infback.c rename to lib/zlib/infback.c diff --git a/zlib/inffast.c b/lib/zlib/inffast.c similarity index 100% rename from zlib/inffast.c rename to lib/zlib/inffast.c diff --git a/zlib/inffast.h b/lib/zlib/inffast.h similarity index 100% rename from zlib/inffast.h rename to lib/zlib/inffast.h diff --git a/zlib/inffixed.h b/lib/zlib/inffixed.h similarity index 100% rename from zlib/inffixed.h rename to lib/zlib/inffixed.h diff --git a/zlib/inflate.c b/lib/zlib/inflate.c similarity index 100% rename from zlib/inflate.c rename to lib/zlib/inflate.c diff --git a/zlib/inflate.h b/lib/zlib/inflate.h similarity index 100% rename from zlib/inflate.h rename to lib/zlib/inflate.h diff --git a/zlib/inftrees.c b/lib/zlib/inftrees.c similarity index 100% rename from zlib/inftrees.c rename to lib/zlib/inftrees.c diff --git a/zlib/inftrees.h b/lib/zlib/inftrees.h similarity index 100% rename from zlib/inftrees.h rename to lib/zlib/inftrees.h diff --git a/zlib/trees.c b/lib/zlib/trees.c similarity index 100% rename from zlib/trees.c rename to lib/zlib/trees.c diff --git a/zlib/trees.h b/lib/zlib/trees.h similarity index 100% rename from zlib/trees.h rename to lib/zlib/trees.h diff --git a/zlib/uncompr.c b/lib/zlib/uncompr.c similarity index 100% rename from zlib/uncompr.c rename to lib/zlib/uncompr.c diff --git a/zlib/zconf.h.in b/lib/zlib/zconf.h.in similarity index 100% rename from zlib/zconf.h.in rename to lib/zlib/zconf.h.in diff --git a/zlib/zlib.h b/lib/zlib/zlib.h similarity index 100% rename from zlib/zlib.h rename to lib/zlib/zlib.h diff --git a/zlib/zutil.c b/lib/zlib/zutil.c similarity index 100% rename from zlib/zutil.c rename to lib/zlib/zutil.c diff --git a/zlib/zutil.h b/lib/zlib/zutil.h similarity index 100% rename from zlib/zutil.h rename to lib/zlib/zutil.h diff --git a/plugins/group_file/Makefile.in b/plugins/group_file/Makefile.in index 7c8102a49..1b11bbdec 100644 --- a/plugins/group_file/Makefile.in +++ b/plugins/group_file/Makefile.in @@ -34,7 +34,7 @@ LIBTOOL = @LIBTOOL@ @LT_STATIC@ INSTALL = $(SHELL) $(top_srcdir)/install-sh -c # Libraries -LT_LIBS = $(LIBOBJDIR)libreplace.la +LT_LIBS = $(top_builddir)/lib/util/libsudo_util.la LIBS = $(LT_LIBS) # C preprocessor flags @@ -150,10 +150,10 @@ realclean: distclean cleandir: realclean # Autogenerated dependencies, do not modify -getgrent.lo: $(srcdir)/getgrent.c $(incdir)/missing.h $(incdir)/sudo_util.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/stdbool.h +getgrent.lo: $(srcdir)/getgrent.c $(incdir)/compat/stdbool.h \ + $(incdir)/missing.h $(incdir)/sudo_util.h $(top_builddir)/config.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/getgrent.c -group_file.lo: $(srcdir)/group_file.c $(incdir)/missing.h \ - $(incdir)/sudo_plugin.h $(top_builddir)/config.h \ - $(top_srcdir)/compat/stdbool.h +group_file.lo: $(srcdir)/group_file.c $(incdir)/compat/stdbool.h \ + $(incdir)/missing.h $(incdir)/sudo_plugin.h \ + $(top_builddir)/config.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/group_file.c diff --git a/plugins/sample/Makefile.in b/plugins/sample/Makefile.in index db8bc4c7a..d0872221b 100644 --- a/plugins/sample/Makefile.in +++ b/plugins/sample/Makefile.in @@ -34,7 +34,7 @@ LIBTOOL = @LIBTOOL@ @LT_STATIC@ INSTALL = $(SHELL) $(top_srcdir)/install-sh -c # Libraries -LIBS = $(LIBOBJDIR)/libreplace.la +LIBS = $(top_builddir)/lib/util/libsudo_util.la # C preprocessor flags CPPFLAGS = -I$(incdir) -I$(top_builddir) -I$(top_srcdir) @CPPFLAGS@ @@ -149,8 +149,8 @@ realclean: distclean cleandir: realclean # Autogenerated dependencies, do not modify -sample_plugin.lo: $(srcdir)/sample_plugin.c $(incdir)/missing.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h +sample_plugin.lo: $(srcdir)/sample_plugin.c $(incdir)/compat/stdbool.h \ + $(incdir)/missing.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/sample_plugin.c diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in index 242388614..e66cfca03 100644 --- a/plugins/sudoers/Makefile.in +++ b/plugins/sudoers/Makefile.in @@ -47,7 +47,7 @@ PERL = perl INSTALL = $(SHELL) $(top_srcdir)/install-sh -c # Libraries -LT_LIBS = $(top_builddir)/common/libsudo_util.la $(LIBOBJDIR)libreplace.la +LT_LIBS = $(top_builddir)/lib/util/libsudo_util.la LIBS = $(LT_LIBS) @LIBINTL@ NET_LIBS = @NET_LIBS@ SUDOERS_LIBS = @SUDOERS_LIBS@ @AFS_LIBS@ @GETGROUPS_LIB@ $(LIBS) $(NET_LIBS) @ZLIB@ @LIBMD@ @LIBDL@ @@ -166,8 +166,6 @@ CHECK_SYMBOLS_OBJS = check_symbols.o locale.o CHECK_WRAP_OBJS = check_wrap.o locale.o logwrap.o -LIBOBJDIR = $(top_builddir)/@ac_config_libobj_dir@/ - VERSION = @PACKAGE_VERSION@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -441,180 +439,177 @@ cleandir: realclean # Autogenerated dependencies, do not modify afs.lo: $(authdir)/afs.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \ - $(srcdir)/logging.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ + $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ + $(srcdir)/sudoers.h $(top_builddir)/config.h $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(authdir)/afs.c aix_auth.lo: $(authdir)/aix_auth.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ - $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ - $(srcdir)/sudoers.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ + $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(authdir)/aix_auth.c alias.lo: $(srcdir)/alias.c $(devdir)/def_data.h $(devdir)/gram.h \ - $(incdir)/alloc.h $(incdir)/fatal.h $(incdir)/fileops.h \ - $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ - $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ - $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/parse.h \ - $(srcdir)/redblack.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(incdir)/alloc.h $(incdir)/compat/stdbool.h $(incdir)/fatal.h \ + $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ + $(incdir)/queue.h $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ + $(srcdir)/parse.h $(srcdir)/redblack.h $(srcdir)/sudo_nss.h \ + $(srcdir)/sudoers.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/alias.c -audit.lo: $(srcdir)/audit.c $(incdir)/gettext.h $(incdir)/missing.h \ - $(incdir)/sudo_debug.h $(srcdir)/bsm_audit.h $(srcdir)/linux_audit.h \ - $(srcdir)/logging.h $(top_builddir)/config.h \ - $(top_srcdir)/compat/stdbool.h +audit.lo: $(srcdir)/audit.c $(incdir)/compat/stdbool.h $(incdir)/gettext.h \ + $(incdir)/missing.h $(incdir)/sudo_debug.h $(srcdir)/bsm_audit.h \ + $(srcdir)/linux_audit.h $(srcdir)/logging.h $(top_builddir)/config.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/audit.c base64.lo: $(srcdir)/base64.c $(incdir)/missing.h $(incdir)/sudo_debug.h \ $(top_builddir)/config.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/base64.c base64.o: base64.lo -boottime.lo: $(srcdir)/boottime.c $(incdir)/missing.h $(incdir)/sudo_debug.h \ - $(top_builddir)/config.h +boottime.lo: $(srcdir)/boottime.c $(incdir)/compat/stdbool.h \ + $(incdir)/missing.h $(incdir)/sudo_debug.h $(top_builddir)/config.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/boottime.c bsdauth.lo: $(authdir)/bsdauth.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \ - $(srcdir)/logging.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ + $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(authdir)/bsdauth.c bsm_audit.lo: $(srcdir)/bsm_audit.c $(incdir)/fatal.h $(incdir)/gettext.h \ $(incdir)/missing.h $(incdir)/sudo_debug.h $(srcdir)/bsm_audit.h \ $(top_builddir)/config.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/bsm_audit.c check.lo: $(srcdir)/check.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/check.h \ - $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ - $(srcdir)/sudoers.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ + $(srcdir)/check.h $(srcdir)/defaults.h $(srcdir)/logging.h \ + $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/check.c check_addr.o: $(srcdir)/regress/parser/check_addr.c $(devdir)/def_data.h \ - $(incdir)/alloc.h $(incdir)/fatal.h $(incdir)/fileops.h \ - $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ - $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/alloc.h $(incdir)/compat/stdbool.h $(incdir)/fatal.h \ + $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ + $(incdir)/queue.h $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ $(incdir)/sudo_util.h $(srcdir)/defaults.h \ $(srcdir)/interfaces.h $(srcdir)/logging.h $(srcdir)/parse.h \ $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/regress/parser/check_addr.c check_base64.o: $(srcdir)/regress/parser/check_base64.c $(incdir)/missing.h \ $(top_builddir)/config.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/regress/parser/check_base64.c -check_digest.o: $(srcdir)/regress/parser/check_digest.c $(incdir)/missing.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/sha2.h +check_digest.o: $(srcdir)/regress/parser/check_digest.c \ + $(incdir)/compat/sha2.h $(incdir)/missing.h \ + $(top_builddir)/config.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/regress/parser/check_digest.c check_fill.o: $(srcdir)/regress/parser/check_fill.c $(devdir)/gram.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_plugin.h \ - $(incdir)/sudo_util.h $(srcdir)/parse.h $(srcdir)/toke.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/parse.h \ + $(srcdir)/toke.h $(top_builddir)/config.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/regress/parser/check_fill.c check_iolog_path.o: $(srcdir)/regress/iolog_path/check_iolog_path.c \ $(devdir)/def_data.c $(devdir)/def_data.h \ - $(incdir)/alloc.h $(incdir)/fatal.h $(incdir)/fileops.h \ - $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/alloc.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ + $(incdir)/missing.h $(incdir)/queue.h \ $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ $(incdir)/sudo_util.h $(srcdir)/defaults.h \ $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ $(srcdir)/sudoers.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h + $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/regress/iolog_path/check_iolog_path.c check_symbols.o: $(srcdir)/regress/check_symbols/check_symbols.c \ - $(incdir)/fatal.h $(incdir)/missing.h $(incdir)/sudo_dso.h \ - $(incdir)/sudo_util.h $(top_builddir)/config.h \ - $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h \ + $(incdir)/missing.h $(incdir)/sudo_dso.h \ + $(incdir)/sudo_util.h $(top_builddir)/config.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/regress/check_symbols/check_symbols.c -check_wrap.o: $(srcdir)/regress/logging/check_wrap.c $(incdir)/fatal.h \ - $(incdir)/missing.h $(incdir)/sudo_plugin.h \ - $(incdir)/sudo_util.h $(top_builddir)/config.h \ - $(top_srcdir)/compat/stdbool.h +check_wrap.o: $(srcdir)/regress/logging/check_wrap.c \ + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/missing.h \ + $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ + $(top_builddir)/config.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/regress/logging/check_wrap.c dce.lo: $(authdir)/dce.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \ - $(srcdir)/logging.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ + $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ + $(srcdir)/sudoers.h $(top_builddir)/config.h $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(authdir)/dce.c defaults.lo: $(srcdir)/defaults.c $(devdir)/def_data.c $(devdir)/def_data.h \ - $(devdir)/gram.h $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ - $(incdir)/queue.h $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ - $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ - $(srcdir)/parse.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(devdir)/gram.h $(incdir)/alloc.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ + $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ + $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ + $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/parse.h \ + $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/defaults.c env.lo: $(srcdir)/env.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \ - $(srcdir)/logging.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ + $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ + $(srcdir)/sudoers.h $(top_builddir)/config.h $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/env.c find_path.lo: $(srcdir)/find_path.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ - $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ - $(srcdir)/sudoers.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ + $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/find_path.c find_path.o: find_path.lo fwtk.lo: $(authdir)/fwtk.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \ - $(srcdir)/logging.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ + $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ + $(srcdir)/sudoers.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(authdir)/fwtk.c getdate.o: $(devdir)/getdate.c $(incdir)/missing.h $(top_builddir)/config.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(devdir)/getdate.c getspwuid.lo: $(srcdir)/getspwuid.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ - $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ - $(srcdir)/sudoers.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ + $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/getspwuid.c goodpath.lo: $(srcdir)/goodpath.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ - $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ - $(srcdir)/sudoers.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ + $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/goodpath.c goodpath.o: goodpath.lo gram.lo: $(devdir)/gram.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \ - $(srcdir)/logging.h $(srcdir)/parse.h $(srcdir)/sudo_nss.h \ - $(srcdir)/sudoers.h $(srcdir)/toke.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ + $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/parse.h \ + $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h $(srcdir)/toke.h \ + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(devdir)/gram.c group_plugin.lo: $(srcdir)/group_plugin.c $(devdir)/def_data.h \ - $(incdir)/alloc.h $(incdir)/fatal.h $(incdir)/fileops.h \ - $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ - $(incdir)/sudo_debug.h $(incdir)/sudo_dso.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ - $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ - $(srcdir)/sudoers.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h + $(incdir)/alloc.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ + $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ + $(incdir)/sudo_dso.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(srcdir)/defaults.h \ + $(srcdir)/logging.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/group_plugin.c group_plugin.o: group_plugin.lo hexchar.lo: $(srcdir)/hexchar.c $(incdir)/missing.h $(incdir)/sudo_debug.h \ @@ -622,159 +617,159 @@ hexchar.lo: $(srcdir)/hexchar.c $(incdir)/missing.h $(incdir)/sudo_debug.h \ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/hexchar.c hexchar.o: hexchar.lo interfaces.lo: $(srcdir)/interfaces.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ + $(incdir)/compat/stdbool.h $(incdir)/fatal.h \ + $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ + $(incdir)/queue.h $(incdir)/sudo_debug.h \ $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ $(srcdir)/defaults.h $(srcdir)/interfaces.h $(srcdir)/logging.h \ $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/interfaces.c interfaces.o: interfaces.lo iolog.lo: $(srcdir)/iolog.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \ - $(srcdir)/iolog.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ - $(srcdir)/sudoers.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ + $(srcdir)/defaults.h $(srcdir)/iolog.h $(srcdir)/logging.h \ + $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/iolog.c iolog_path.lo: $(srcdir)/iolog_path.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ + $(incdir)/compat/stdbool.h $(incdir)/fatal.h \ + $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ + $(incdir)/queue.h $(incdir)/sudo_debug.h \ $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ $(srcdir)/sudoers.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/iolog_path.c iolog_path.o: iolog_path.lo kerb5.lo: $(authdir)/kerb5.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \ - $(srcdir)/logging.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ + $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ + $(srcdir)/sudoers.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(authdir)/kerb5.c ldap.lo: $(srcdir)/ldap.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/lbuf.h $(incdir)/missing.h $(incdir)/queue.h \ - $(incdir)/sudo_debug.h $(incdir)/sudo_dso.h $(incdir)/sudo_plugin.h \ - $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ - $(srcdir)/parse.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/lbuf.h $(incdir)/missing.h \ + $(incdir)/queue.h $(incdir)/sudo_debug.h $(incdir)/sudo_dso.h \ + $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \ + $(srcdir)/logging.h $(srcdir)/parse.h $(srcdir)/sudo_nss.h \ + $(srcdir)/sudoers.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/ldap.c linux_audit.lo: $(srcdir)/linux_audit.c $(incdir)/alloc.h $(incdir)/fatal.h \ $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/sudo_debug.h \ $(srcdir)/linux_audit.h $(top_builddir)/config.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/linux_audit.c -locale.lo: $(srcdir)/locale.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/gettext.h $(incdir)/missing.h $(srcdir)/logging.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/stdbool.h +locale.lo: $(srcdir)/locale.c $(incdir)/alloc.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/gettext.h $(incdir)/missing.h \ + $(srcdir)/logging.h $(top_builddir)/config.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/locale.c locale.o: locale.lo logging.lo: $(srcdir)/logging.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \ - $(srcdir)/logging.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ + $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/logging.c logwrap.lo: $(srcdir)/logwrap.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \ - $(srcdir)/logging.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ + $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/logwrap.c logwrap.o: logwrap.lo match.lo: $(srcdir)/match.c $(devdir)/def_data.h $(devdir)/gram.h \ - $(incdir)/alloc.h $(incdir)/fatal.h $(incdir)/fileops.h \ - $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ - $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ - $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/parse.h \ - $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/fnmatch.h \ - $(top_srcdir)/compat/glob.h $(top_srcdir)/compat/sha2.h \ - $(top_srcdir)/compat/stdbool.h + $(incdir)/alloc.h $(incdir)/compat/fnmatch.h $(incdir)/compat/glob.h \ + $(incdir)/compat/sha2.h $(incdir)/compat/stdbool.h $(incdir)/fatal.h \ + $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ + $(incdir)/queue.h $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ + $(srcdir)/parse.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/match.c match_addr.lo: $(srcdir)/match_addr.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ + $(incdir)/compat/stdbool.h $(incdir)/fatal.h \ + $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ + $(incdir)/queue.h $(incdir)/sudo_debug.h \ $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ $(srcdir)/defaults.h $(srcdir)/interfaces.h $(srcdir)/logging.h \ $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/match_addr.c match_addr.o: match_addr.lo -net_ifs.o: $(top_srcdir)/src/net_ifs.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ - $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/stdbool.h +net_ifs.o: $(top_srcdir)/src/net_ifs.c $(incdir)/alloc.h \ + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/gettext.h \ + $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_conf.h \ + $(incdir)/sudo_debug.h $(top_builddir)/config.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(top_srcdir)/src/net_ifs.c pam.lo: $(authdir)/pam.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \ - $(srcdir)/logging.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ + $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ + $(srcdir)/sudoers.h $(top_builddir)/config.h $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(authdir)/pam.c parse.lo: $(srcdir)/parse.c $(devdir)/def_data.h $(devdir)/gram.h \ - $(incdir)/alloc.h $(incdir)/fatal.h $(incdir)/fileops.h \ - $(incdir)/gettext.h $(incdir)/lbuf.h $(incdir)/missing.h \ - $(incdir)/queue.h $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ - $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ - $(srcdir)/parse.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(incdir)/alloc.h $(incdir)/compat/stdbool.h $(incdir)/fatal.h \ + $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/lbuf.h \ + $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ + $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \ + $(srcdir)/logging.h $(srcdir)/parse.h $(srcdir)/sudo_nss.h \ + $(srcdir)/sudoers.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/parse.c passwd.lo: $(authdir)/passwd.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \ - $(srcdir)/logging.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ + $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(authdir)/passwd.c policy.lo: $(srcdir)/policy.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \ - $(srcdir)/interfaces.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ - $(srcdir)/sudoers.h $(srcdir)/sudoers_version.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/interfaces.h \ + $(srcdir)/logging.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ + $(srcdir)/sudoers_version.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/policy.c prompt.lo: $(srcdir)/prompt.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \ - $(srcdir)/logging.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ + $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/prompt.c pwutil.lo: $(srcdir)/pwutil.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \ - $(srcdir)/logging.h $(srcdir)/pwutil.h $(srcdir)/redblack.h \ - $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ + $(srcdir)/pwutil.h $(srcdir)/redblack.h $(srcdir)/sudo_nss.h \ + $(srcdir)/sudoers.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/pwutil.c pwutil.o: pwutil.lo pwutil_impl.lo: $(srcdir)/pwutil_impl.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ + $(incdir)/compat/stdbool.h $(incdir)/fatal.h \ + $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ + $(incdir)/queue.h $(incdir)/sudo_debug.h \ $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/pwutil.h \ $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/pwutil_impl.c pwutil_impl.o: pwutil_impl.lo redblack.lo: $(srcdir)/redblack.c $(incdir)/alloc.h $(incdir)/missing.h \ @@ -783,159 +778,157 @@ redblack.lo: $(srcdir)/redblack.c $(incdir)/alloc.h $(incdir)/missing.h \ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/redblack.c redblack.o: redblack.lo rfc1938.lo: $(authdir)/rfc1938.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \ - $(srcdir)/logging.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ + $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(authdir)/rfc1938.c secureware.lo: $(authdir)/secureware.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ + $(incdir)/compat/stdbool.h $(incdir)/fatal.h \ + $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ + $(incdir)/queue.h $(incdir)/sudo_debug.h \ $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ $(srcdir)/sudoers.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(authdir)/secureware.c securid5.lo: $(authdir)/securid5.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ - $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ - $(srcdir)/sudoers.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ + $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(authdir)/securid5.c set_perms.lo: $(srcdir)/set_perms.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ - $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ - $(srcdir)/sudoers.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ + $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/set_perms.c sia.lo: $(authdir)/sia.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \ - $(srcdir)/logging.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ + $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ + $(srcdir)/sudoers.h $(top_builddir)/config.h $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(authdir)/sia.c sssd.lo: $(srcdir)/sssd.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/lbuf.h $(incdir)/missing.h $(incdir)/queue.h \ - $(incdir)/sudo_debug.h $(incdir)/sudo_dso.h $(incdir)/sudo_plugin.h \ - $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ - $(srcdir)/parse.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/lbuf.h $(incdir)/missing.h \ + $(incdir)/queue.h $(incdir)/sudo_debug.h $(incdir)/sudo_dso.h \ + $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \ + $(srcdir)/logging.h $(srcdir)/parse.h $(srcdir)/sudo_nss.h \ + $(srcdir)/sudoers.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/sssd.c sudo_auth.lo: $(authdir)/sudo_auth.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ - $(srcdir)/defaults.h $(srcdir)/ins_2001.h \ + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/ins_2001.h \ $(srcdir)/ins_classic.h $(srcdir)/ins_csops.h \ $(srcdir)/ins_goons.h $(srcdir)/insults.h $(srcdir)/logging.h \ $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(authdir)/sudo_auth.c sudo_nss.lo: $(srcdir)/sudo_nss.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/lbuf.h $(incdir)/missing.h $(incdir)/queue.h \ - $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/lbuf.h $(incdir)/missing.h \ + $(incdir)/queue.h $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/sudo_nss.c sudoers.lo: $(srcdir)/sudoers.c $(devdir)/def_data.h $(incdir)/alloc.h \ + $(incdir)/compat/getaddrinfo.h $(incdir)/compat/stdbool.h \ $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ $(incdir)/missing.h $(incdir)/queue.h $(incdir)/secure_path.h \ $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ $(incdir)/sudo_util.h $(srcdir)/auth/sudo_auth.h \ $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ $(srcdir)/sudoers.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/getaddrinfo.h \ - $(top_srcdir)/compat/stdbool.h + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/sudoers.c -sudoreplay.o: $(srcdir)/sudoreplay.c $(incdir)/alloc.h $(incdir)/fatal.h \ +sudoreplay.o: $(srcdir)/sudoreplay.c $(incdir)/alloc.h \ + $(incdir)/compat/getopt.h $(incdir)/compat/stdbool.h \ + $(incdir)/compat/timespec.h $(incdir)/fatal.h \ $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ $(incdir)/sudo_event.h $(incdir)/sudo_plugin.h \ $(incdir)/sudo_util.h $(srcdir)/iolog.h $(srcdir)/logging.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/getopt.h $(top_srcdir)/compat/stdbool.h \ - $(top_srcdir)/compat/timespec.h + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/sudoreplay.c testsudoers.o: $(srcdir)/testsudoers.c $(devdir)/def_data.h $(devdir)/gram.h \ - $(incdir)/alloc.h $(incdir)/fatal.h $(incdir)/fileops.h \ - $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ - $(incdir)/secure_path.h $(incdir)/sudo_conf.h \ + $(incdir)/alloc.h $(incdir)/compat/fnmatch.h \ + $(incdir)/compat/stdbool.h $(incdir)/fatal.h \ + $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ + $(incdir)/queue.h $(incdir)/secure_path.h $(incdir)/sudo_conf.h \ $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ $(incdir)/sudo_util.h $(srcdir)/defaults.h \ $(srcdir)/interfaces.h $(srcdir)/logging.h $(srcdir)/parse.h \ $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h $(srcdir)/tsgetgrpw.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/fnmatch.h $(top_srcdir)/compat/stdbool.h + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/testsudoers.c timestamp.lo: $(srcdir)/timestamp.c $(devdir)/def_data.h $(incdir)/alloc.h \ + $(incdir)/compat/stdbool.h $(incdir)/compat/timespec.h \ $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ $(incdir)/missing.h $(incdir)/queue.h $(incdir)/secure_path.h \ $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ $(incdir)/sudo_util.h $(srcdir)/check.h $(srcdir)/defaults.h \ $(srcdir)/logging.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h $(top_srcdir)/compat/timespec.h + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/timestamp.c timestr.lo: $(srcdir)/timestr.c $(incdir)/missing.h $(top_builddir)/config.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/timestr.c toke.lo: $(devdir)/toke.c $(devdir)/def_data.h $(devdir)/gram.h \ - $(incdir)/alloc.h $(incdir)/fatal.h $(incdir)/fileops.h \ - $(incdir)/gettext.h $(incdir)/lbuf.h $(incdir)/missing.h \ - $(incdir)/queue.h $(incdir)/secure_path.h $(incdir)/sudo_debug.h \ + $(incdir)/alloc.h $(incdir)/compat/sha2.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ + $(incdir)/lbuf.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/secure_path.h $(incdir)/sudo_debug.h \ $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \ $(srcdir)/logging.h $(srcdir)/parse.h $(srcdir)/sudo_nss.h \ $(srcdir)/sudoers.h $(srcdir)/toke.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/sha2.h \ - $(top_srcdir)/compat/stdbool.h + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(devdir)/toke.c toke_util.lo: $(srcdir)/toke_util.c $(devdir)/def_data.h $(devdir)/gram.h \ - $(incdir)/alloc.h $(incdir)/fatal.h $(incdir)/fileops.h \ - $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ - $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/alloc.h $(incdir)/compat/stdbool.h $(incdir)/fatal.h \ + $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ + $(incdir)/queue.h $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ $(srcdir)/parse.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ $(srcdir)/toke.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h + $(top_builddir)/pathnames.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/toke_util.c toke_util.o: toke_util.lo tsgetgrpw.o: $(srcdir)/tsgetgrpw.c $(devdir)/def_data.h $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ - $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/sudo_nss.h \ - $(srcdir)/sudoers.h $(srcdir)/tsgetgrpw.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ + $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h $(srcdir)/tsgetgrpw.h \ + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/tsgetgrpw.c visudo.o: $(srcdir)/visudo.c $(devdir)/def_data.h $(devdir)/gram.h \ - $(incdir)/alloc.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/alloc.h $(incdir)/compat/getopt.h \ + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ $(srcdir)/parse.h $(srcdir)/redblack.h $(srcdir)/sudo_nss.h \ $(srcdir)/sudoers.h $(srcdir)/sudoers_version.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/getopt.h $(top_srcdir)/compat/stdbool.h + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/visudo.c visudo_json.o: $(srcdir)/visudo_json.c $(devdir)/def_data.h $(devdir)/gram.h \ - $(incdir)/alloc.h $(incdir)/fatal.h $(incdir)/fileops.h \ - $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ - $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ - $(incdir)/sudo_util.h $(srcdir)/defaults.h $(srcdir)/logging.h \ - $(srcdir)/parse.h $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(incdir)/alloc.h $(incdir)/compat/stdbool.h $(incdir)/fatal.h \ + $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ + $(incdir)/queue.h $(incdir)/sudo_debug.h \ + $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ + $(srcdir)/defaults.h $(srcdir)/logging.h $(srcdir)/parse.h \ + $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \ + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/visudo_json.c diff --git a/plugins/system_group/Makefile.in b/plugins/system_group/Makefile.in index 8b8caa7fd..cb746dc44 100644 --- a/plugins/system_group/Makefile.in +++ b/plugins/system_group/Makefile.in @@ -34,7 +34,7 @@ LIBTOOL = @LIBTOOL@ @LT_STATIC@ INSTALL = $(SHELL) $(top_srcdir)/install-sh -c # Libraries -LT_LIBS = $(LIBOBJDIR)libreplace.la +LT_LIBS = $(top_builddir)/lib/util/libsudo_util.la LIBS = $(LT_LIBS) # C preprocessor flags @@ -150,8 +150,8 @@ realclean: distclean cleandir: realclean # Autogenerated dependencies, do not modify -system_group.lo: $(srcdir)/system_group.c $(incdir)/missing.h \ - $(incdir)/sudo_dso.h $(incdir)/sudo_plugin.h \ - $(incdir)/sudo_util.h $(top_builddir)/config.h \ - $(top_srcdir)/compat/stdbool.h +system_group.lo: $(srcdir)/system_group.c $(incdir)/compat/stdbool.h \ + $(incdir)/missing.h $(incdir)/sudo_dso.h \ + $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ + $(top_builddir)/config.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/system_group.c diff --git a/src/po/README b/po/README similarity index 100% rename from src/po/README rename to po/README diff --git a/src/po/ca.mo b/po/ca.mo similarity index 100% rename from src/po/ca.mo rename to po/ca.mo diff --git a/src/po/ca.po b/po/ca.po similarity index 100% rename from src/po/ca.po rename to po/ca.po diff --git a/src/po/cs.mo b/po/cs.mo similarity index 100% rename from src/po/cs.mo rename to po/cs.mo diff --git a/src/po/cs.po b/po/cs.po similarity index 100% rename from src/po/cs.po rename to po/cs.po diff --git a/src/po/da.mo b/po/da.mo similarity index 100% rename from src/po/da.mo rename to po/da.mo diff --git a/src/po/da.po b/po/da.po similarity index 100% rename from src/po/da.po rename to po/da.po diff --git a/src/po/de.mo b/po/de.mo similarity index 100% rename from src/po/de.mo rename to po/de.mo diff --git a/src/po/de.po b/po/de.po similarity index 100% rename from src/po/de.po rename to po/de.po diff --git a/src/po/eo.mo b/po/eo.mo similarity index 100% rename from src/po/eo.mo rename to po/eo.mo diff --git a/src/po/eo.po b/po/eo.po similarity index 100% rename from src/po/eo.po rename to po/eo.po diff --git a/src/po/es.mo b/po/es.mo similarity index 100% rename from src/po/es.mo rename to po/es.mo diff --git a/src/po/es.po b/po/es.po similarity index 100% rename from src/po/es.po rename to po/es.po diff --git a/src/po/eu.mo b/po/eu.mo similarity index 100% rename from src/po/eu.mo rename to po/eu.mo diff --git a/src/po/eu.po b/po/eu.po similarity index 100% rename from src/po/eu.po rename to po/eu.po diff --git a/src/po/fi.mo b/po/fi.mo similarity index 100% rename from src/po/fi.mo rename to po/fi.mo diff --git a/src/po/fi.po b/po/fi.po similarity index 100% rename from src/po/fi.po rename to po/fi.po diff --git a/src/po/fr.mo b/po/fr.mo similarity index 100% rename from src/po/fr.mo rename to po/fr.mo diff --git a/src/po/fr.po b/po/fr.po similarity index 100% rename from src/po/fr.po rename to po/fr.po diff --git a/src/po/gl.mo b/po/gl.mo similarity index 100% rename from src/po/gl.mo rename to po/gl.mo diff --git a/src/po/gl.po b/po/gl.po similarity index 100% rename from src/po/gl.po rename to po/gl.po diff --git a/src/po/hr.mo b/po/hr.mo similarity index 100% rename from src/po/hr.mo rename to po/hr.mo diff --git a/src/po/hr.po b/po/hr.po similarity index 100% rename from src/po/hr.po rename to po/hr.po diff --git a/src/po/it.mo b/po/it.mo similarity index 100% rename from src/po/it.mo rename to po/it.mo diff --git a/src/po/it.po b/po/it.po similarity index 100% rename from src/po/it.po rename to po/it.po diff --git a/src/po/ja.mo b/po/ja.mo similarity index 100% rename from src/po/ja.mo rename to po/ja.mo diff --git a/src/po/ja.po b/po/ja.po similarity index 100% rename from src/po/ja.po rename to po/ja.po diff --git a/src/po/nb.mo b/po/nb.mo similarity index 100% rename from src/po/nb.mo rename to po/nb.mo diff --git a/src/po/nb.po b/po/nb.po similarity index 100% rename from src/po/nb.po rename to po/nb.po diff --git a/src/po/nl.mo b/po/nl.mo similarity index 100% rename from src/po/nl.mo rename to po/nl.mo diff --git a/src/po/nl.po b/po/nl.po similarity index 100% rename from src/po/nl.po rename to po/nl.po diff --git a/src/po/pl.mo b/po/pl.mo similarity index 100% rename from src/po/pl.mo rename to po/pl.mo diff --git a/src/po/pl.po b/po/pl.po similarity index 100% rename from src/po/pl.po rename to po/pl.po diff --git a/src/po/pt_BR.mo b/po/pt_BR.mo similarity index 100% rename from src/po/pt_BR.mo rename to po/pt_BR.mo diff --git a/src/po/pt_BR.po b/po/pt_BR.po similarity index 100% rename from src/po/pt_BR.po rename to po/pt_BR.po diff --git a/src/po/ru.mo b/po/ru.mo similarity index 100% rename from src/po/ru.mo rename to po/ru.mo diff --git a/src/po/ru.po b/po/ru.po similarity index 100% rename from src/po/ru.po rename to po/ru.po diff --git a/src/po/sl.mo b/po/sl.mo similarity index 100% rename from src/po/sl.mo rename to po/sl.mo diff --git a/src/po/sl.po b/po/sl.po similarity index 100% rename from src/po/sl.po rename to po/sl.po diff --git a/src/po/sr.mo b/po/sr.mo similarity index 100% rename from src/po/sr.mo rename to po/sr.mo diff --git a/src/po/sr.po b/po/sr.po similarity index 100% rename from src/po/sr.po rename to po/sr.po diff --git a/src/po/sudo.pot b/po/sudo.pot similarity index 100% rename from src/po/sudo.pot rename to po/sudo.pot diff --git a/src/po/sv.mo b/po/sv.mo similarity index 100% rename from src/po/sv.mo rename to po/sv.mo diff --git a/src/po/sv.po b/po/sv.po similarity index 100% rename from src/po/sv.po rename to po/sv.po diff --git a/src/po/tr.mo b/po/tr.mo similarity index 100% rename from src/po/tr.mo rename to po/tr.mo diff --git a/src/po/tr.po b/po/tr.po similarity index 100% rename from src/po/tr.po rename to po/tr.po diff --git a/src/po/uk.mo b/po/uk.mo similarity index 100% rename from src/po/uk.mo rename to po/uk.mo diff --git a/src/po/uk.po b/po/uk.po similarity index 100% rename from src/po/uk.po rename to po/uk.po diff --git a/src/po/vi.mo b/po/vi.mo similarity index 100% rename from src/po/vi.mo rename to po/vi.mo diff --git a/src/po/vi.po b/po/vi.po similarity index 100% rename from src/po/vi.po rename to po/vi.po diff --git a/src/po/zh_CN.mo b/po/zh_CN.mo similarity index 100% rename from src/po/zh_CN.mo rename to po/zh_CN.mo diff --git a/src/po/zh_CN.po b/po/zh_CN.po similarity index 100% rename from src/po/zh_CN.po rename to po/zh_CN.po diff --git a/src/Makefile.in b/src/Makefile.in index 065ebeccf..4c76c7c59 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -34,7 +34,7 @@ LIBTOOL = @LIBTOOL@ @LT_STATIC@ INSTALL = $(SHELL) $(top_srcdir)/install-sh -c # Libraries -LT_LIBS = $(top_builddir)/common/libsudo_util.la $(LIBOBJDIR)libreplace.la +LT_LIBS = $(top_builddir)/lib/util/libsudo_util.la LIBS = @LIBS@ @SUDO_LIBS@ @GETGROUPS_LIB@ @NET_LIBS@ @LIBINTL@ $(LT_LIBS) @LIBDL@ # C preprocessor flags @@ -135,7 +135,7 @@ libsudo_noexec.la: sudo_noexec.lo sesh: $(SESH_OBJS) @LIBINTL@ $(LT_LIBS) $(LIBTOOL) --mode=link $(CC) -o $@ $(SESH_OBJS) $(LDFLAGS) $(PIE_LDFLAGS) $(SSP_LDFLAGS) @LIBINTL@ $(LIBS) -check_ttyname: $(CHECK_TTYNAME_OBJS) $(top_builddir)/common/libsudo_util.la $(LIBOBJDIR)libreplace.la +check_ttyname: $(CHECK_TTYNAME_OBJS) $(top_builddir)/lib/util/libsudo_util.la $(LIBTOOL) --mode=link $(CC) -o $@ $(CHECK_TTYNAME_OBJS) $(TEST_LDFLAGS) $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(TEST_LIBS) pre-install: @@ -205,158 +205,160 @@ cleandir: realclean # Autogenerated dependencies, do not modify check_ttyname.o: $(srcdir)/regress/ttyname/check_ttyname.c $(incdir)/alloc.h \ - $(incdir)/fatal.h $(incdir)/missing.h $(incdir)/sudo_util.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/stdbool.h + $(incdir)/compat/stdbool.h $(incdir)/fatal.h \ + $(incdir)/missing.h $(incdir)/sudo_util.h \ + $(top_builddir)/config.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/regress/ttyname/check_ttyname.c -conversation.o: $(srcdir)/conversation.c $(incdir)/alloc.h $(incdir)/fatal.h \ +conversation.o: $(srcdir)/conversation.c $(incdir)/alloc.h \ + $(incdir)/compat/stdbool.h $(incdir)/fatal.h \ $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ $(incdir)/queue.h $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/sudo.h \ $(srcdir)/sudo_plugin_int.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h + $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/conversation.c -env_hooks.o: $(srcdir)/env_hooks.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ - $(incdir)/queue.h $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_dso.h $(incdir)/sudo_plugin.h \ - $(incdir)/sudo_util.h $(srcdir)/sudo.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h +env_hooks.o: $(srcdir)/env_hooks.c $(incdir)/alloc.h \ + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h $(incdir)/sudo_dso.h \ + $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/sudo.h \ + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/env_hooks.c -exec.o: $(srcdir)/exec.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ - $(incdir)/queue.h $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_event.h $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ - $(srcdir)/sudo.h $(srcdir)/sudo_exec.h $(srcdir)/sudo_plugin_int.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h +exec.o: $(srcdir)/exec.c $(incdir)/alloc.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ + $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_conf.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_event.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(srcdir)/sudo.h $(srcdir)/sudo_exec.h \ + $(srcdir)/sudo_plugin_int.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/exec.c -exec_common.o: $(srcdir)/exec_common.c $(incdir)/alloc.h $(incdir)/fatal.h \ +exec_common.o: $(srcdir)/exec_common.c $(incdir)/alloc.h \ + $(incdir)/compat/stdbool.h $(incdir)/fatal.h \ $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ $(incdir)/queue.h $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ $(incdir)/sudo_util.h $(srcdir)/sudo.h $(srcdir)/sudo_exec.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/exec_common.c -exec_pty.o: $(srcdir)/exec_pty.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ - $(incdir)/queue.h $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_event.h $(incdir)/sudo_plugin.h \ - $(incdir)/sudo_util.h $(srcdir)/sudo.h $(srcdir)/sudo_exec.h \ - $(srcdir)/sudo_plugin_int.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h +exec_pty.o: $(srcdir)/exec_pty.c $(incdir)/alloc.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ + $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_conf.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_event.h \ + $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/sudo.h \ + $(srcdir)/sudo_exec.h $(srcdir)/sudo_plugin_int.h \ + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/exec_pty.c -get_pty.o: $(srcdir)/get_pty.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ - $(incdir)/queue.h $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_util.h $(srcdir)/sudo.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h +get_pty.o: $(srcdir)/get_pty.c $(incdir)/alloc.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ + $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_conf.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_util.h $(srcdir)/sudo.h \ + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/get_pty.c -hooks.o: $(srcdir)/hooks.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ - $(incdir)/queue.h $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/sudo.h \ - $(srcdir)/sudo_plugin_int.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h +hooks.o: $(srcdir)/hooks.c $(incdir)/alloc.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ + $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_conf.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ + $(srcdir)/sudo.h $(srcdir)/sudo_plugin_int.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/hooks.c -load_plugins.o: $(srcdir)/load_plugins.c $(incdir)/alloc.h $(incdir)/fatal.h \ +load_plugins.o: $(srcdir)/load_plugins.c $(incdir)/alloc.h \ + $(incdir)/compat/stdbool.h $(incdir)/fatal.h \ $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ $(incdir)/queue.h $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ $(incdir)/sudo_dso.h $(incdir)/sudo_plugin.h \ $(incdir)/sudo_util.h $(srcdir)/sudo.h \ $(srcdir)/sudo_plugin_int.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h + $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/load_plugins.c locale_stub.o: $(srcdir)/locale_stub.c $(incdir)/fatal.h $(incdir)/gettext.h \ $(incdir)/missing.h $(top_builddir)/config.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/locale_stub.c -net_ifs.o: $(srcdir)/net_ifs.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ - $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ - $(top_builddir)/config.h $(top_srcdir)/compat/stdbool.h - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/net_ifs.c -openbsd.o: $(srcdir)/openbsd.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ +net_ifs.o: $(srcdir)/net_ifs.c $(incdir)/alloc.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/gettext.h $(incdir)/missing.h \ $(incdir)/queue.h $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_util.h $(srcdir)/sudo.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h + $(top_builddir)/config.h + $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/net_ifs.c +openbsd.o: $(srcdir)/openbsd.c $(incdir)/alloc.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ + $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_conf.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_util.h $(srcdir)/sudo.h \ + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/openbsd.c -parse_args.o: $(srcdir)/parse_args.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/lbuf.h \ - $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_conf.h \ - $(incdir)/sudo_debug.h $(incdir)/sudo_util.h $(srcdir)/sudo.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/getopt.h $(top_srcdir)/compat/stdbool.h \ - ./sudo_usage.h +parse_args.o: $(srcdir)/parse_args.c $(incdir)/alloc.h \ + $(incdir)/compat/getopt.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ + $(incdir)/lbuf.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ + $(incdir)/sudo_util.h $(srcdir)/sudo.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h ./sudo_usage.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/parse_args.c preload.o: $(srcdir)/preload.c $(incdir)/sudo_dso.h $(incdir)/sudo_plugin.h \ $(top_builddir)/config.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/preload.c -preserve_fds.o: $(srcdir)/preserve_fds.c $(incdir)/alloc.h $(incdir)/fatal.h \ +preserve_fds.o: $(srcdir)/preserve_fds.c $(incdir)/alloc.h \ + $(incdir)/compat/stdbool.h $(incdir)/fatal.h \ $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ $(incdir)/queue.h $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ $(incdir)/sudo_util.h $(srcdir)/sudo.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/preserve_fds.c -selinux.o: $(srcdir)/selinux.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ - $(incdir)/queue.h $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_util.h $(srcdir)/sudo.h $(srcdir)/sudo_exec.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h +selinux.o: $(srcdir)/selinux.c $(incdir)/alloc.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ + $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_conf.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_util.h $(srcdir)/sudo.h \ + $(srcdir)/sudo_exec.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/selinux.c -sesh.o: $(srcdir)/sesh.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ - $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ - $(srcdir)/sudo_exec.h $(top_builddir)/config.h \ - $(top_srcdir)/compat/stdbool.h +sesh.o: $(srcdir)/sesh.c $(incdir)/alloc.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/gettext.h $(incdir)/missing.h \ + $(incdir)/queue.h $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ + $(incdir)/sudo_plugin.h $(srcdir)/sudo_exec.h $(top_builddir)/config.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/sesh.c -signal.o: $(srcdir)/signal.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ - $(incdir)/queue.h $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_util.h $(srcdir)/sudo.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h +signal.o: $(srcdir)/signal.c $(incdir)/alloc.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ + $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_conf.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_util.h $(srcdir)/sudo.h \ + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/signal.c -solaris.o: $(srcdir)/solaris.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ - $(incdir)/queue.h $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_util.h $(srcdir)/sudo.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h +solaris.o: $(srcdir)/solaris.c $(incdir)/alloc.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ + $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_conf.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_util.h $(srcdir)/sudo.h \ + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/solaris.c -sudo.o: $(srcdir)/sudo.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ - $(incdir)/queue.h $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/sudo.h \ - $(srcdir)/sudo_plugin_int.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h \ - ./sudo_usage.h +sudo.o: $(srcdir)/sudo.c $(incdir)/alloc.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ + $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_conf.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h \ + $(srcdir)/sudo.h $(srcdir)/sudo_plugin_int.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h ./sudo_usage.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/sudo.c -sudo_edit.o: $(srcdir)/sudo_edit.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ - $(incdir)/queue.h $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ +sudo_edit.o: $(srcdir)/sudo_edit.c $(incdir)/alloc.h \ + $(incdir)/compat/stdbool.h $(incdir)/fatal.h $(incdir)/fileops.h \ + $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/queue.h \ + $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ $(incdir)/sudo_util.h $(srcdir)/sudo.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h + $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/sudo_edit.c sudo_noexec.lo: $(srcdir)/sudo_noexec.c $(incdir)/missing.h \ $(top_builddir)/config.h $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/sudo_noexec.c -tgetpass.o: $(srcdir)/tgetpass.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ - $(incdir)/queue.h $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_plugin.h $(incdir)/sudo_util.h $(srcdir)/sudo.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h +tgetpass.o: $(srcdir)/tgetpass.c $(incdir)/alloc.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ + $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_conf.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_plugin.h \ + $(incdir)/sudo_util.h $(srcdir)/sudo.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/tgetpass.c -ttyname.o: $(srcdir)/ttyname.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ - $(incdir)/queue.h $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_util.h $(srcdir)/sudo.h $(top_builddir)/config.h \ - $(top_builddir)/pathnames.h $(top_srcdir)/compat/stdbool.h +ttyname.o: $(srcdir)/ttyname.c $(incdir)/alloc.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ + $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_conf.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_util.h $(srcdir)/sudo.h \ + $(top_builddir)/config.h $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/ttyname.c -utmp.o: $(srcdir)/utmp.c $(incdir)/alloc.h $(incdir)/fatal.h \ - $(incdir)/fileops.h $(incdir)/gettext.h $(incdir)/missing.h \ - $(incdir)/queue.h $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \ - $(incdir)/sudo_util.h $(srcdir)/sudo.h $(srcdir)/sudo_exec.h \ - $(top_builddir)/config.h $(top_builddir)/pathnames.h \ - $(top_srcdir)/compat/stdbool.h +utmp.o: $(srcdir)/utmp.c $(incdir)/alloc.h $(incdir)/compat/stdbool.h \ + $(incdir)/fatal.h $(incdir)/fileops.h $(incdir)/gettext.h \ + $(incdir)/missing.h $(incdir)/queue.h $(incdir)/sudo_conf.h \ + $(incdir)/sudo_debug.h $(incdir)/sudo_util.h $(srcdir)/sudo.h \ + $(srcdir)/sudo_exec.h $(top_builddir)/config.h \ + $(top_builddir)/pathnames.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/utmp.c -- 2.49.0