diff options
author | Arturo Borrero Gonzalez <arturo@netfilter.org> | 2018-11-28 13:47:28 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-12-05 12:27:50 +0100 |
commit | 6218f812d894fdd733d95c3c86b385f6f223a36a (patch) | |
tree | a973419bb9a97ab66d128789f9a6c5298b412837 /Makefile.am | |
parent | ca223bf49807d55c80d4fe1604dc943e6dc069d7 (diff) |
ebtables: legacy renaming
The original ebtables tool is now the legacy version, let's rename it.
A more uptodate client of the ebtables tool is provided in the iptables
tarball (ebtables-nft). The new tool was formerly known as ebtables-compat.
The new -legacy binary has no problem if called via a symlink with the
'ebtables' name, so users can still name this binary with whatever name.
Signed-off-by: Arturo Borrero Gonzalez <arturo@netfilter.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 14938fe..b16a4d6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,11 +26,11 @@ AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_srcdir}/include \ -DEBTD_PIPE=\"${PIPE}\" -DEBTD_PIPE_DIR=\"${PIPE_DIR}\" AM_CFLAGS = ${regular_CFLAGS} -sbin_PROGRAMS = ebtables ebtablesd ebtablesu ebtables-restore +sbin_PROGRAMS = ebtables-legacy ebtablesd ebtablesu ebtables-legacy-restore EXTRA_PROGRAMS = static examples/ulog/test_ulog sysconf_DATA = ethertypes -sbin_SCRIPTS = ebtables-save -man8_MANS = ebtables.8 +sbin_SCRIPTS = ebtables-legacy-save +man8_MANS = ebtables-legacy.8 lib_LTLIBRARIES = libebtc.la libebtc_la_SOURCES = \ @@ -47,21 +47,22 @@ libebtc_la_SOURCES = \ extensions/ebtable_nat.c # Make sure ebtables.c can be built twice libebtc_la_CPPFLAGS = ${AM_CPPFLAGS} -ebtables_SOURCES = ebtables-standalone.c -ebtables_LDADD = libebtc.la +ebtables_legacy_SOURCES = ebtables-standalone.c +ebtables_legacy_LDADD = libebtc.la ebtablesd_LDADD = libebtc.la -ebtables_restore_LDADD = libebtc.la +ebtables_legacy_restore_SOURCES = ebtables-restore.c +ebtables_legacy_restore_LDADD = libebtc.la static_SOURCES = ebtables.c static_LDFLAGS = -static static_LDADD = libebtc.la examples_ulog_test_ulog_SOURCES = examples/ulog/test_ulog.c getethertype.c daemon: ebtablesd ebtablesu -exec: ebtables ebtables-restore +exec: ebtables-legacy ebtables-legacy-restore -CLEANFILES = ebtables-save ebtables.sysv ebtables-config ebtables.8 +CLEANFILES = ebtables-legacy-save ebtables.sysv ebtables-config ebtables-legacy.8 -ebtables-save: ebtables-save.in ${top_builddir}/config.status +ebtables-legacy-save: ebtables-save.in ${top_builddir}/config.status ${AM_V_GEN}sed -e 's![@]sbindir@!${sbindir}!g' <$< >$@ ebtables.sysv: ebtables.sysv.in ${top_builddir}/config.status @@ -70,7 +71,7 @@ ebtables.sysv: ebtables.sysv.in ${top_builddir}/config.status ebtables-config: ebtables-config.in ${top_builddir}/config.status ${AM_V_GEN}sed -e 's![@]sysconfigdir@!${sysconfigdir}!g' <$< >$@ -ebtables.8: ebtables.8.in ${top_builddir}/config.status +ebtables-legacy.8: ebtables-legacy.8.in ${top_builddir}/config.status ${AM_V_GEN}sed -e 's![@]PACKAGE_VERSION!${PACKAGE_VERSION}!g' \ -e 's![@]PACKAGE_DATE@!${PROGDATE}!g' \ -e 's![@]LOCKFILE@!${LOCKFILE}!g' <$< >$@ |