Hi, Here's the patch cleaning up the automake variables a bit, originally sent some time ago [0]. It moves the global ones to the top of the file as they affect all following rules. Splits long lines into ones not over 80 chars. Switches INCLUDES to AM_CPPFLAGS. Refactors common flags into global variables (ping's LDADD).
[0] <http://lists.gnu.org/archive/html/bug-inetutils/2011-10/msg00057.html> If the shape of this looks generally fine, then I can prepare ChangeLog entries, or if you'd rather see it split in smaller chunks, then I can try to do that too. --- ftp/Makefile.am | 17 ++++++++++------- ftpd/Makefile.am | 22 +++++++++++++--------- ifconfig/Makefile.am | 14 +++++++++----- libinetutils/Makefile.am | 13 +++++++------ libls/Makefile.am | 5 +++-- libtelnet/Makefile.am | 12 +++++++++--- ping/Makefile.am | 13 ++++++++++--- src/Makefile.am | 25 +++++++++++++++++-------- talk/Makefile.am | 12 ++++++++---- talkd/Makefile.am | 15 +++++++++------ telnet/Makefile.am | 16 +++++++++++----- telnetd/Makefile.am | 21 ++++++++++++++------- whois/Makefile.am | 8 +++++--- 13 files changed, 125 insertions(+), 68 deletions(-) diff --git a/ftp/Makefile.am b/ftp/Makefile.am index 0d5ec3f..3d134c7 100644 --- a/ftp/Makefile.am +++ b/ftp/Makefile.am @@ -18,6 +18,16 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see `http://www.gnu.org/licenses/'. +@PATHDEFS_MAKE@ + +AM_CPPFLAGS = \ + $(iu_INCLUDES) \ + $(PATHDEF_TMP) $(PATHDEF_BSHELL) + +LDADD = \ + $(iu_LIBRARIES) \ + $(LIBGLOB) $(LIBREADLINE) $(LIBTERMCAP) $(LIBHISTORY) + bin_PROGRAMS = $(ftp_BUILD) EXTRA_PROGRAMS = ftp @@ -25,10 +35,3 @@ EXTRA_PROGRAMS = ftp ftp_SOURCES = cmds.c cmdtab.c domacro.c ftp.c main.c ruserpass.c noinst_HEADERS = extern.h ftp_var.h - -@PATHDEFS_MAKE@ - -INCLUDES = $(iu_INCLUDES) -AM_CPPFLAGS = $(PATHDEF_TMP) $(PATHDEF_BSHELL) - -LDADD = $(iu_LIBRARIES) $(LIBGLOB) $(LIBREADLINE) $(LIBTERMCAP) $(LIBHISTORY) diff --git a/ftpd/Makefile.am b/ftpd/Makefile.am index dd54ba7..a6dc2a3 100644 --- a/ftpd/Makefile.am +++ b/ftpd/Makefile.am @@ -18,6 +18,19 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see `http://www.gnu.org/licenses/'. +@PATHDEFS_MAKE@ + +AM_CPPFLAGS = \ + $(iu_INCLUDES) \ + $(PATHDEF_FTPWELCOME) $(PATHDEF_FTPUSERS) \ + $(PATHDEF_FTPLOGINMESG) $(PATHDEF_FTPCHROOT) $(PATHDEF_FTPDPID) \ + $(PATHDEF_DEVNULL) $(PATHDEF_NOLOGIN) $(PATHDEF_BSHELL) + +LDADD = \ + $(LIBLS) \ + $(iu_LIBRARIES) \ + $(LIBCRYPT) $(LIBWRAP) $(FTPD_LIBPAM) $(LIBDL) + inetdaemondir = @inetdaemondir@ inetdaemon_PROGRAMS = $(ftpd_BUILD) @@ -29,13 +42,4 @@ ftpd_SOURCES = ftpcmd.y ftpd.c popen.c pam.c auth.c \ noinst_HEADERS = extern.h -@PATHDEFS_MAKE@ - -INCLUDES = $(iu_INCLUDES) -AM_CPPFLAGS = $(PATHDEF_FTPWELCOME) $(PATHDEF_FTPUSERS) \ - $(PATHDEF_FTPLOGINMESG) $(PATHDEF_FTPCHROOT) $(PATHDEF_FTPDPID) \ - $(PATHDEF_DEVNULL) $(PATHDEF_NOLOGIN) $(PATHDEF_BSHELL) - -LDADD = $(LIBLS) $(LIBCRYPT) $(LIBWRAP) $(FTPD_LIBPAM) $(LIBDL) $(iu_LIBRARIES) - EXTRA_DIST = ftpcmd.c diff --git a/ifconfig/Makefile.am b/ifconfig/Makefile.am index 7cd0e16..89dec27 100644 --- a/ifconfig/Makefile.am +++ b/ifconfig/Makefile.am @@ -19,6 +19,15 @@ SUBDIRS = system +@PATHDEFS_MAKE@ + +AM_CPPFLAGS = \ + $(iu_INCLUDES) \ + $(PATHDEF_PROCNET_DEV) + +LDADD = \ + $(iu_LIBRARIES) + bin_PROGRAMS = $(ifconfig_BUILD) EXTRA_PROGRAMS = ifconfig @@ -26,8 +35,3 @@ EXTRA_PROGRAMS = ifconfig ifconfig_SOURCES = ifconfig.c flags.c changeif.c options.c printif.c system.c noinst_HEADERS = ifconfig.h flags.h options.h printif.h system.h - -@PATHDEFS_MAKE@ -AM_CPPFLAGS = $(PATHDEF_PROCNET_DEV) -INCLUDES = $(iu_INCLUDES) -LDADD = $(iu_LIBRARIES) diff --git a/libinetutils/Makefile.am b/libinetutils/Makefile.am index 7c599bc..db98f38 100644 --- a/libinetutils/Makefile.am +++ b/libinetutils/Makefile.am @@ -18,6 +18,13 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see `http://www.gnu.org/licenses/'. +@PATHDEFS_MAKE@ + +AM_CPPFLAGS = \ + $(iu_INCLUDES) $(INCAUTH) \ + $(PATHDEF_WTMPX) $(PATHDEF_TTY_PFX) $(PATHDEF_DEVNULL) \ + $(PATHDEF_HEQUIV) + noinst_LIBRARIES = libinetutils.a noinst_HEADERS = argcv.h libinetutils.h tftpsubs.h shishi_def.h @@ -41,9 +48,3 @@ libinetutils_a_SOURCES = \ ttymsg.c\ utmp_init.c\ utmp_logout.c - -@PATHDEFS_MAKE@ - -AM_CPPFLAGS = $(PATHDEF_WTMPX) $(PATHDEF_TTY_PFX) $(PATHDEF_DEVNULL) $(PATHDEF_HEQUIV) - -INCLUDES = $(iu_INCLUDES) $(INCAUTH) diff --git a/libls/Makefile.am b/libls/Makefile.am index 6dedddb..202596d 100644 --- a/libls/Makefile.am +++ b/libls/Makefile.am @@ -17,6 +17,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see `http://www.gnu.org/licenses/'. +AM_CPPFLAGS = \ + $(iu_INCLUDES) + noinst_LIBRARIES = $(libls_BUILD) EXTRA_LIBRARIES = libls.a @@ -24,5 +27,3 @@ EXTRA_LIBRARIES = libls.a libls_a_SOURCES = cmp.c stat_flags.c ls.c print.c util.c fts.c noinst_HEADERS = extern.h ls.h fts.h - -INCLUDES = $(iu_INCLUDES) diff --git a/libtelnet/Makefile.am b/libtelnet/Makefile.am index 87cb583..ba8b28e 100644 --- a/libtelnet/Makefile.am +++ b/libtelnet/Makefile.am @@ -18,10 +18,16 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see `http://www.gnu.org/licenses/'. -INCLUDES = $(iu_INCLUDES) $(INCAUTH) +AM_CPPFLAGS = \ + $(INCAUTH) \ + $(iu_INCLUDES) noinst_LIBRARIES = libtelnet.a -libtelnet_a_SOURCES = auth.c enc_des.c encrypt.c forward.c genget.c kerberos.c kerberos5.c misc.c read_passwd.c shishi.c +libtelnet_a_SOURCES = \ + auth.c enc_des.c encrypt.c forward.c genget.c \ + kerberos.c kerberos5.c misc.c read_passwd.c shishi.c -noinst_HEADERS = auth-proto.h auth.h enc-proto.h encrypt.h genget.h key-proto.h misc-proto.h misc.h +noinst_HEADERS = \ + auth-proto.h auth.h enc-proto.h encrypt.h genget.h key-proto.h \ + misc-proto.h misc.h diff --git a/ping/Makefile.am b/ping/Makefile.am index 172e2a4..99e04a9 100644 --- a/ping/Makefile.am +++ b/ping/Makefile.am @@ -18,13 +18,20 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see `http://www.gnu.org/licenses/'. +AM_CPPFLAGS = \ + $(iu_INCLUDES) \ + -I$(top_srcdir)/libicmp \ + $(INCIDN) + +LDADD = \ + $(iu_LIBRARIES) \ + $(LIBIDN) + bin_PROGRAMS = $(ping_BUILD) $(ping6_BUILD) EXTRA_PROGRAMS = ping ping6 -ping_LDADD = $(iu_LIBRARIES) $(top_builddir)/libicmp/libicmp.a $(LIBIDN) -ping6_LDADD = $(iu_LIBRARIES) $(LIBIDN) -INCLUDES = $(iu_INCLUDES) -I$(top_srcdir)/libicmp $(INCIDN) +ping_LDADD = $(top_builddir)/libicmp/libicmp.a $(LDADD) ping_SOURCES = ping.c ping_common.c ping_echo.c ping_address.c \ ping_router.c ping_timestamp.c ping_common.h ping_impl.h ping.h libping.c diff --git a/src/Makefile.am b/src/Makefile.am index 74078a1..aae6086 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,10 +18,25 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see `http://www.gnu.org/licenses/'. -inetdaemondir = @inetdaemondir@ +@PATHDEFS_MAKE@ # Initialise variables. -LDADD = $(iu_LIBRARIES) $(LIBUTIL) +AM_CPPFLAGS = \ + $(iu_INCLUDES) $(INCAUTH) $(INCIDN) \ + -I$(top_srcdir)/libicmp \ + $(PATHDEF_BSHELL) $(PATHDEF_CONSOLE) $(PATHDEF_CP) \ + $(PATHDEF_DEFPATH) $(PATHDEF_DEV) $(PATHDEF_INETDCONF) \ + $(PATHDEF_INETDDIR) $(PATHDEF_INETDPID) $(PATHDEF_KLOG) \ + $(PATHDEF_LOG) $(PATHDEF_LOGCONF) $(PATHDEF_LOGCONFD) \ + $(PATHDEF_LOGIN) $(PATHDEF_LOGPID) $(PATHDEF_NOLOGIN) \ + $(PATHDEF_RLOGIN) $(PATHDEF_RSH) $(PATHDEF_TTY) $(PATHDEF_TTY_PFX) \ + $(PATHDEF_UTMP) $(PATHDEF_UTMPX) $(PATHDEF_UUCICO) + +LDADD = \ + $(iu_LIBRARIES) \ + $(LIBUTIL) + +inetdaemondir = @inetdaemondir@ inetdaemon_PROGRAMS = bin_PROGRAMS = @@ -100,10 +115,6 @@ uucpd_SOURCES = uucpd.c uucpd_LDADD = $(LDADD) $(LIBCRYPT) EXTRA_PROGRAMS += uucpd -INCLUDES = $(iu_INCLUDES) $(INCAUTH) -I$(top_srcdir)/libicmp $(INCIDN) - -AM_CPPFLAGS = $(PATHDEF_BSHELL) $(PATHDEF_CONSOLE) $(PATHDEF_CP) $(PATHDEF_DEFPATH) $(PATHDEF_DEV) $(PATHDEF_INETDCONF) $(PATHDEF_INETDDIR) $(PATHDEF_INETDPID) $(PATHDEF_KLOG) $(PATHDEF_LOG) $(PATHDEF_LOGCONF) $(PATHDEF_LOGCONFD) $(PATHDEF_LOGIN) $(PATHDEF_LOGPID) $(PATHDEF_NOLOGIN) $(PATHDEF_RLOGIN) $(PATHDEF_RSH) $(PATHDEF_TTY) $(PATHDEF_TTY_PFX) $(PATHDEF_UTMP) $(PATHDEF_UTMPX) $(PATHDEF_UUCICO) - SUIDMODE = -o root -m 4775 install-exec-hook: $(traceroute_INSTALL_HOOK) $(rsh_INSTALL_HOOK) $(rlogin_INSTALL_HOOK) $(rcp_INSTALL_HOOK) @@ -135,5 +146,3 @@ install-rcp-hook: echo "WARNING: insufficient access; not installing rcp"; \ echo "NOTE: To install rcp run 'make install' as root"; \ fi - -@PATHDEFS_MAKE@ diff --git a/talk/Makefile.am b/talk/Makefile.am index 77e25e6..ce0f99b 100644 --- a/talk/Makefile.am +++ b/talk/Makefile.am @@ -18,6 +18,14 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see `http://www.gnu.org/licenses/'. +AM_CPPFLAGS = \ + $(iu_INCLUDES) \ + $(NCURSES_INCLUDE) + +LDADD = \ + $(iu_LIBRARIES) \ + $(LIBCURSES) + bin_PROGRAMS = $(talk_BUILD) EXTRA_PROGRAMS = talk @@ -25,7 +33,3 @@ EXTRA_PROGRAMS = talk talk_SOURCES = ctl.c ctl_transact.c display.c get_addrs.c get_names.c init_disp.c invite.c io.c look_up.c msgs.c talk.c noinst_HEADERS = talk.h talk_ctl.h - -INCLUDES = $(iu_INCLUDES) $(NCURSES_INCLUDE) - -LDADD = $(iu_LIBRARIES) $(LIBCURSES) diff --git a/talkd/Makefile.am b/talkd/Makefile.am index f654a05..e31fbb0 100644 --- a/talkd/Makefile.am +++ b/talkd/Makefile.am @@ -18,6 +18,15 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see `http://www.gnu.org/licenses/'. +@PATHDEFS_MAKE@ + +AM_CPPFLAGS = \ + $(iu_INCLUDES) \ + $(PATHDEF_DEV) \ + $(PATHDEF_TTY_PFX) $(PATHDEF_UTMP) $(PATHDEF_UTMPX) + +LDADD = $(iu_LIBRARIES) + inetdaemondir = @inetdaemondir@ inetdaemon_PROGRAMS = $(talkd_BUILD) @@ -32,9 +41,3 @@ talkd_SOURCES = \ table.c\ talkd.c\ intalkd.h - -@PATHDEFS_MAKE@ - -AM_CPPFLAGS = $(PATHDEF_DEV) $(PATHDEF_TTY_PFX) $(PATHDEF_UTMP) $(PATHDEF_UTMPX) -INCLUDES = $(iu_INCLUDES) -LDADD = $(iu_LIBRARIES) diff --git a/telnet/Makefile.am b/telnet/Makefile.am index a18f9a0..29b3bcb 100644 --- a/telnet/Makefile.am +++ b/telnet/Makefile.am @@ -18,6 +18,17 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see `http://www.gnu.org/licenses/'. +AM_CPPFLAGS = \ + -DTERMCAP -DLINEMODE -DKLUDGELINEMODE -DENV_HACK \ + $(iu_INCLUDES) \ + -I$(top_srcdir) \ + $(NCURSES_INCLUDE) + +LDADD = \ + $(top_builddir)/libtelnet/libtelnet.a \ + $(iu_LIBRARIES) \ + $(LIBTERMCAP) $(LIBCRYPT) $(LIBAUTH) + bin_PROGRAMS = $(telnet_BUILD) EXTRA_PROGRAMS = telnet @@ -26,8 +37,3 @@ telnet_SOURCES = authenc.c commands.c main.c network.c ring.c sys_bsd.c \ telnet.c terminal.c tn3270.c utilities.c noinst_HEADERS = defines.h externs.h general.h ring.h types.h - -INCLUDES = $(iu_INCLUDES) -I$(top_srcdir) $(NCURSES_INCLUDE) -AM_CPPFLAGS = -DTERMCAP -DLINEMODE -DKLUDGELINEMODE -DENV_HACK - -LDADD = $(iu_LIBRARIES) $(top_builddir)/libtelnet/libtelnet.a $(LIBTERMCAP) $(LIBCRYPT) $(LIBAUTH) diff --git a/telnetd/Makefile.am b/telnetd/Makefile.am index e18943a..4c4ec90 100644 --- a/telnetd/Makefile.am +++ b/telnetd/Makefile.am @@ -18,6 +18,19 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see `http://www.gnu.org/licenses/'. +@PATHDEFS_MAKE@ + +AM_CPPFLAGS = \ + $(iu_INCLUDES) \ + -I$(top_srcdir) \ + $(INCAUTH) $(NCURSES_INCLUDE) \ + $(PATHDEF_DEV) $(PATHDEF_TTY) $(PATHDEF_TTY_PFX) $(PATHDEF_LOGIN) + +LDADD = \ + $(top_builddir)/libtelnet/libtelnet.a \ + $(iu_LIBRARIES) \ + $(LIBTERMCAP) $(LIBUTIL) $(LIBCRYPT) $(LIBAUTH) + inetdaemondir = @inetdaemondir@ inetdaemon_PROGRAMS = $(telnetd_BUILD) @@ -25,11 +38,5 @@ inetdaemon_PROGRAMS = $(telnetd_BUILD) EXTRA_PROGRAMS = telnetd telnetd_SOURCES = telnetd.c pty.c term.c utility.c state.c termstat.c slc.c -noinst_HEADERS = telnetd.h -@PATHDEFS_MAKE@ - -AM_CPPFLAGS = $(PATHDEF_DEV) $(PATHDEF_TTY) $(PATHDEF_TTY_PFX) $(PATHDEF_LOGIN) -INCLUDES = $(iu_INCLUDES) -I$(top_srcdir) $(INCAUTH) $(NCURSES_INCLUDE) - -LDADD = $(iu_LIBRARIES) $(top_builddir)/libtelnet/libtelnet.a $(LIBTERMCAP) $(LIBUTIL) $(LIBCRYPT) $(LIBAUTH) +noinst_HEADERS = telnetd.h diff --git a/whois/Makefile.am b/whois/Makefile.am index 5d59cf7..f554a21 100644 --- a/whois/Makefile.am +++ b/whois/Makefile.am @@ -17,6 +17,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see `http://www.gnu.org/licenses/'. +AM_CPPFLAGS = $(iu_INCLUDES) + +LDADD = $(iu_LIBRARIES) + bin_PROGRAMS = $(whois_BUILD) EXTRA_PROGRAMS = whois @@ -28,10 +32,8 @@ EXTRA_DIST = as_del_list ip_del_list tld_serv_list \ as_del.h ip_del.h tld_serv.h noinst_HEADERS = data.h as_del.h ip_del.h tld_serv.h whois.h -BUILT_SOURCES = as_del.h ip_del.h tld_serv.h -INCLUDES = $(iu_INCLUDES) -LDADD = $(iu_LIBRARIES) +BUILT_SOURCES = as_del.h ip_del.h tld_serv.h as_del.h: $(srcdir)/as_del_list $(srcdir)/make_as_del.pl LANG=C perl $(srcdir)/make_as_del.pl < $(srcdir)/as_del_list > as_del.h -- 1.8.1
