[iptables] build: build only iptables-multi
Patrick McHardy
netfilter-cvslog-bounces at lists.netfilter.org
Mon Aug 3 15:45:54 CEST 2009
Gitweb: http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commit;h=80fcb7b40823fed288e253c4a798eb4ee405102c
commit 80fcb7b40823fed288e253c4a798eb4ee405102c
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Sat Jul 25 18:18:36 2009 +0200
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Sat Jul 25 21:58:37 2009 +0200
build: build only iptables-multi
I see no pressing reason to install all single programs when the
multi binary can do the job. Within the build directory, developers
can run the components by means of, for example,
./ip6tables-multi {main|restore|save} ...
And when make install-ed, symlinks are available.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit b79ec69027fd8b65e7eccd78a445b6665e8ad53b
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Thu Jul 23 17:41:21 2009 +0200
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Sat Jul 25 21:40:56 2009 +0200
build: combine iptables-multi and iptables-static
Changed the Makefile so that:
1. --enable-shared / --disable-shared control the linkage against
libdl (and thus the potential to use 3rd party extensions)
2. --enable-static / --disable-static controls whether shipped
extensions are built-in or provided as modules
iptables-static becomes redundant by this action; iptables-multi now
has the feature.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 4186f8aa0b113ea1a52aa90292ff89b96bed9c39
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Thu Jul 23 20:21:45 2009 +0200
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Sat Jul 25 18:27:15 2009 +0200
build: fix struct size mismatch
Mixing code compiled with and without -DNO_SHARED_LIBS is fine as
long as the structs have the same layout. This patch prevents a
potential (currently non-triggerable) "ip6tables: target (null)<123>
is missing a version" error.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit de054f7709b20c97d3e1f16465d5617d9e7683d5
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Sat Jul 25 14:28:07 2009 +0200
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Sat Jul 25 18:26:59 2009 +0200
multi binary: allow subcommand via argv[1]
libtool does not play well with symlinks when trying to run commands
in the build directory. So provide an alternate way to call
iptables-multi: when argv[0] is not a recognized name, inspect [1]
for an alternate identifer.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit bb5c136dd49e04ce28b2479200f32ea8f92c1b70
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Thu Jul 23 15:06:16 2009 +0200
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Thu Jul 23 15:06:20 2009 +0200
build: order of dependent libs is sensitive
libiptc.la must come after its components or `make install` won't get
things right.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
via 80fcb7b40823fed288e253c4a798eb4ee405102c (commit)
via b79ec69027fd8b65e7eccd78a445b6665e8ad53b (commit)
via 4186f8aa0b113ea1a52aa90292ff89b96bed9c39 (commit)
via de054f7709b20c97d3e1f16465d5617d9e7683d5 (commit)
via bb5c136dd49e04ce28b2479200f32ea8f92c1b70 (commit)
from add2457a23b9894905b498b13c8328f9cffcaada (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 80fcb7b40823fed288e253c4a798eb4ee405102c
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Sat Jul 25 18:18:36 2009 +0200
build: build only iptables-multi
I see no pressing reason to install all single programs when the
multi binary can do the job. Within the build directory, developers
can run the components by means of, for example,
./ip6tables-multi {main|restore|save} ...
And when make install-ed, symlinks are available.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit b79ec69027fd8b65e7eccd78a445b6665e8ad53b
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Thu Jul 23 17:41:21 2009 +0200
build: combine iptables-multi and iptables-static
Changed the Makefile so that:
1. --enable-shared / --disable-shared control the linkage against
libdl (and thus the potential to use 3rd party extensions)
2. --enable-static / --disable-static controls whether shipped
extensions are built-in or provided as modules
iptables-static becomes redundant by this action; iptables-multi now
has the feature.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 4186f8aa0b113ea1a52aa90292ff89b96bed9c39
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Thu Jul 23 20:21:45 2009 +0200
build: fix struct size mismatch
Mixing code compiled with and without -DNO_SHARED_LIBS is fine as
long as the structs have the same layout. This patch prevents a
potential (currently non-triggerable) "ip6tables: target (null)<123>
is missing a version" error.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit de054f7709b20c97d3e1f16465d5617d9e7683d5
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Sat Jul 25 14:28:07 2009 +0200
multi binary: allow subcommand via argv[1]
libtool does not play well with symlinks when trying to run commands
in the build directory. So provide an alternate way to call
iptables-multi: when argv[0] is not a recognized name, inspect [1]
for an alternate identifer.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit bb5c136dd49e04ce28b2479200f32ea8f92c1b70
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Thu Jul 23 15:06:16 2009 +0200
build: order of dependent libs is sensitive
libiptc.la must come after its components or `make install` won't get
things right.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
-----------------------------------------------------------------------
INSTALL | 41 ++++++++++++++++------
Makefile.am | 84 ++++++++++++++-------------------------------
extensions/GNUmakefile.in | 4 +-
include/xtables.h.in | 6 +---
ip6tables-multi.c | 53 +++++++++++++++++-----------
ip6tables-restore.c | 2 +-
ip6tables-save.c | 2 +-
ip6tables-standalone.c | 2 +-
iptables-multi.c | 60 ++++++++++++++++++++------------
iptables-restore.c | 2 +-
iptables-save.c | 2 +-
iptables-standalone.c | 2 +-
12 files changed, 135 insertions(+), 125 deletions(-)
libiptc.la must come after its components or `make install` won't get
things right.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
diff --git a/Makefile.am b/Makefile.am
index a9e3ad3..23cdedd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ endif
lib_LTLIBRARIES =
# libiptc
-lib_LTLIBRARIES += libiptc/libiptc.la libiptc/libip4tc.la libiptc/libip6tc.la
+lib_LTLIBRARIES += libiptc/libip4tc.la libiptc/libip6tc.la libiptc/libiptc.la
libiptc_libiptc_la_SOURCES =
libiptc_libiptc_la_LIBADD = libiptc/libip4tc.la libiptc/libip6tc.la
libiptc_libiptc_la_LDFLAGS = -version-info 0:0:0
More information about the netfilter-cvslog
mailing list