* ipset: build updates
@ 2011-12-17 15:35 Jan Engelhardt
2011-12-17 15:35 ` [PATCH 1/6] Update .gitignore Jan Engelhardt
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Jan Engelhardt @ 2011-12-17 15:35 UTC (permalink / raw)
To: kadlec; +Cc: netfilter-devel
The following changes since commit 7c061f216ee04a8df5f49521b146f4a274b5f1ac:
ipset 6.10 released (2011-11-25 09:36:04 +0100)
are available in the git repository at:
git://dev.medozas.de/ipset master
Jan Engelhardt (6):
Update .gitignore
build: use AC_CONFIG_AUX_DIR and stash away tools
build: process include/libipset/
build: include libipset/nfproto.h
build: install libipset/linux_ip_set_list.h
build: make distcheck work and use POSIX mode for tarball generation
.gitignore | 12 ++++--------
Makefile.am | 4 +++-
configure.ac | 5 +++--
include/Makefile.am | 1 -
include/libipset/Makefile.am | 7 +++++--
src/Makefile.am | 2 +-
6 files changed, 16 insertions(+), 15 deletions(-)
delete mode 100644 include/Makefile.am
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/6] Update .gitignore
2011-12-17 15:35 ipset: build updates Jan Engelhardt
@ 2011-12-17 15:35 ` Jan Engelhardt
2011-12-17 15:35 ` [PATCH 2/6] build: use AC_CONFIG_AUX_DIR and stash away tools Jan Engelhardt
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Jan Engelhardt @ 2011-12-17 15:35 UTC (permalink / raw)
To: kadlec; +Cc: netfilter-devel
Only ignore these paths if they are a directory.
---
.gitignore | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6992cc9..07b1ff5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,8 @@
*.la
*.lo
*.o
-.deps
-.libs
+.deps/
+.libs/
Makefile
Makefile.in
@@ -17,7 +17,7 @@ Module.symvers
modules.order
/aclocal.m4
-/autom4te.cache
+/autom4te.cache/
/compile
/config.*
/configure
--
1.7.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/6] build: use AC_CONFIG_AUX_DIR and stash away tools
2011-12-17 15:35 ipset: build updates Jan Engelhardt
2011-12-17 15:35 ` [PATCH 1/6] Update .gitignore Jan Engelhardt
@ 2011-12-17 15:35 ` Jan Engelhardt
2011-12-17 15:35 ` [PATCH 3/6] build: process include/libipset/ Jan Engelhardt
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Jan Engelhardt @ 2011-12-17 15:35 UTC (permalink / raw)
To: kadlec; +Cc: netfilter-devel
---
.gitignore | 6 +-----
configure.ac | 1 +
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index 07b1ff5..a3168e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,12 +18,8 @@ modules.order
/aclocal.m4
/autom4te.cache/
-/compile
+/build-aux/
/config.*
/configure
-/depcomp
-/install-sh
/libtool
-/ltmain.sh
-/missing
/stamp-h1
diff --git a/configure.ac b/configure.ac
index 692f740..e277d05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,6 @@
dnl Boilerplate
AC_INIT([ipset], [6.10], [kadlec@blackhole.kfki.hu])
+AC_CONFIG_AUX_DIR([build-aux])
AC_CANONICAL_HOST
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADER([config.h])
--
1.7.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/6] build: process include/libipset/
2011-12-17 15:35 ipset: build updates Jan Engelhardt
2011-12-17 15:35 ` [PATCH 1/6] Update .gitignore Jan Engelhardt
2011-12-17 15:35 ` [PATCH 2/6] build: use AC_CONFIG_AUX_DIR and stash away tools Jan Engelhardt
@ 2011-12-17 15:35 ` Jan Engelhardt
2011-12-17 15:35 ` [PATCH 4/6] build: include libipset/nfproto.h Jan Engelhardt
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Jan Engelhardt @ 2011-12-17 15:35 UTC (permalink / raw)
To: kadlec; +Cc: netfilter-devel
We need to visit that directory, otherwise `make install` is
incomplete and `make distcheck` fails.
---
Makefile.am | 2 +-
configure.ac | 2 +-
include/Makefile.am | 1 -
include/libipset/Makefile.am | 3 +--
4 files changed, 3 insertions(+), 5 deletions(-)
delete mode 100644 include/Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 09ba4d9..513d641 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ else
V=0
endif
-SUBDIRS = lib src
+SUBDIRS = include/libipset lib src
modules_sparse:
if WITH_KMOD
diff --git a/configure.ac b/configure.ac
index e277d05..acae162 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,5 +161,5 @@ fi
dnl Checks for library functions.
dnl Generate output
-AC_CONFIG_FILES([Makefile lib/Makefile src/Makefile])
+AC_CONFIG_FILES([Makefile include/libipset/Makefile lib/Makefile src/Makefile])
AC_OUTPUT
diff --git a/include/Makefile.am b/include/Makefile.am
deleted file mode 100644
index 2c4eb5c..0000000
--- a/include/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = libipset
diff --git a/include/libipset/Makefile.am b/include/libipset/Makefile.am
index b17293c..3c21d0f 100644
--- a/include/libipset/Makefile.am
+++ b/include/libipset/Makefile.am
@@ -6,11 +6,10 @@ pkginclude_HEADERS = \
linux_ip_set_hash.h \
mnl.h \
nf_inet_addr.h \
- nlattr.h \
parse.h \
pfxlen.h \
print.h \
- session.h
+ session.h \
transport.h \
types.h \
ui.h \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/6] build: include libipset/nfproto.h
2011-12-17 15:35 ipset: build updates Jan Engelhardt
` (2 preceding siblings ...)
2011-12-17 15:35 ` [PATCH 3/6] build: process include/libipset/ Jan Engelhardt
@ 2011-12-17 15:35 ` Jan Engelhardt
2011-12-17 15:35 ` [PATCH 5/6] build: install libipset/linux_ip_set_list.h Jan Engelhardt
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Jan Engelhardt @ 2011-12-17 15:35 UTC (permalink / raw)
To: kadlec; +Cc: netfilter-devel
libipset/types.h, which is installed by default, requires nfproto.h.
---
include/libipset/Makefile.am | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/include/libipset/Makefile.am b/include/libipset/Makefile.am
index 3c21d0f..30b0df8 100644
--- a/include/libipset/Makefile.am
+++ b/include/libipset/Makefile.am
@@ -6,6 +6,7 @@ pkginclude_HEADERS = \
linux_ip_set_hash.h \
mnl.h \
nf_inet_addr.h \
+ nfproto.h \
parse.h \
pfxlen.h \
print.h \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 5/6] build: install libipset/linux_ip_set_list.h
2011-12-17 15:35 ipset: build updates Jan Engelhardt
` (3 preceding siblings ...)
2011-12-17 15:35 ` [PATCH 4/6] build: include libipset/nfproto.h Jan Engelhardt
@ 2011-12-17 15:35 ` Jan Engelhardt
2011-12-17 15:35 ` [PATCH 6/6] build: make distcheck work and use POSIX mode for tarball generation Jan Engelhardt
2011-12-23 20:31 ` ipset: build updates Jozsef Kadlecsik
6 siblings, 0 replies; 8+ messages in thread
From: Jan Engelhardt @ 2011-12-17 15:35 UTC (permalink / raw)
To: kadlec; +Cc: netfilter-devel
The other linux_ip_set*.h files are shipped, so this one probably
should too.
---
include/libipset/Makefile.am | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/include/libipset/Makefile.am b/include/libipset/Makefile.am
index 30b0df8..d15fedd 100644
--- a/include/libipset/Makefile.am
+++ b/include/libipset/Makefile.am
@@ -4,6 +4,7 @@ pkginclude_HEADERS = \
linux_ip_set_bitmap.h \
linux_ip_set.h \
linux_ip_set_hash.h \
+ linux_ip_set_list.h \
mnl.h \
nf_inet_addr.h \
nfproto.h \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 6/6] build: make distcheck work and use POSIX mode for tarball generation
2011-12-17 15:35 ipset: build updates Jan Engelhardt
` (4 preceding siblings ...)
2011-12-17 15:35 ` [PATCH 5/6] build: install libipset/linux_ip_set_list.h Jan Engelhardt
@ 2011-12-17 15:35 ` Jan Engelhardt
2011-12-23 20:31 ` ipset: build updates Jozsef Kadlecsik
6 siblings, 0 replies; 8+ messages in thread
From: Jan Engelhardt @ 2011-12-17 15:35 UTC (permalink / raw)
To: kadlec; +Cc: netfilter-devel
---
Makefile.am | 2 ++
configure.ac | 2 +-
include/libipset/Makefile.am | 2 ++
src/Makefile.am | 2 +-
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 513d641..c40f88e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,3 +75,5 @@ tidy: distclean modules_clean
find . -name '*~' -delete
.PHONY: modules modules_instal modules_clean update_includes tests
+
+DISTCHECK_CONFIGURE_FLAGS = --with-kmod=no
diff --git a/configure.ac b/configure.ac
index acae162..56a2dff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR([build-aux])
AC_CANONICAL_HOST
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE([foreign subdir-objects])
+AM_INIT_AUTOMAKE([foreign subdir-objects tar-pax])
dnl Shortcut: Linux supported alone
case "$host" in
diff --git a/include/libipset/Makefile.am b/include/libipset/Makefile.am
index d15fedd..2bb353b 100644
--- a/include/libipset/Makefile.am
+++ b/include/libipset/Makefile.am
@@ -16,3 +16,5 @@ pkginclude_HEADERS = \
types.h \
ui.h \
utils.h
+
+EXTRA_DIST = debug.h icmp.h icmpv6.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 8ba441d..5296047 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,7 @@ ipset_SOURCES = ipset.c \
ipset_LDADD = ../lib/libipset.la
AM_LDFLAGS = -static
-man_MANS = ipset.8
+dist_man_MANS = ipset.8
#%.o: %.c
# ${AM_VERBOSE_CC} ${CC} ${AM_DEPFLAGS} ${AM_CFLAGS} ${CFLAGS} -o $@ -c $<
--
1.7.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: ipset: build updates
2011-12-17 15:35 ipset: build updates Jan Engelhardt
` (5 preceding siblings ...)
2011-12-17 15:35 ` [PATCH 6/6] build: make distcheck work and use POSIX mode for tarball generation Jan Engelhardt
@ 2011-12-23 20:31 ` Jozsef Kadlecsik
6 siblings, 0 replies; 8+ messages in thread
From: Jozsef Kadlecsik @ 2011-12-23 20:31 UTC (permalink / raw)
To: Jan Engelhardt; +Cc: netfilter-devel
Hi Jan,
On Sat, 17 Dec 2011, Jan Engelhardt wrote:
> The following changes since commit 7c061f216ee04a8df5f49521b146f4a274b5f1ac:
>
> ipset 6.10 released (2011-11-25 09:36:04 +0100)
>
> are available in the git repository at:
> git://dev.medozas.de/ipset master
>
> Jan Engelhardt (6):
> Update .gitignore
> build: use AC_CONFIG_AUX_DIR and stash away tools
> build: process include/libipset/
> build: include libipset/nfproto.h
> build: install libipset/linux_ip_set_list.h
> build: make distcheck work and use POSIX mode for tarball generation
>
> .gitignore | 12 ++++--------
> Makefile.am | 4 +++-
> configure.ac | 5 +++--
> include/Makefile.am | 1 -
> include/libipset/Makefile.am | 7 +++++--
> src/Makefile.am | 2 +-
> 6 files changed, 16 insertions(+), 15 deletions(-)
> delete mode 100644 include/Makefile.am
Thanks, all patches are applied.
Best regards,
Jozsef
-
E-mail : kadlec@blackhole.kfki.hu, kadlec@mail.kfki.hu
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : KFKI Research Institute for Particle and Nuclear Physics
H-1525 Budapest 114, POB. 49, Hungary
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-12-23 20:31 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-17 15:35 ipset: build updates Jan Engelhardt
2011-12-17 15:35 ` [PATCH 1/6] Update .gitignore Jan Engelhardt
2011-12-17 15:35 ` [PATCH 2/6] build: use AC_CONFIG_AUX_DIR and stash away tools Jan Engelhardt
2011-12-17 15:35 ` [PATCH 3/6] build: process include/libipset/ Jan Engelhardt
2011-12-17 15:35 ` [PATCH 4/6] build: include libipset/nfproto.h Jan Engelhardt
2011-12-17 15:35 ` [PATCH 5/6] build: install libipset/linux_ip_set_list.h Jan Engelhardt
2011-12-17 15:35 ` [PATCH 6/6] build: make distcheck work and use POSIX mode for tarball generation Jan Engelhardt
2011-12-23 20:31 ` ipset: build updates Jozsef Kadlecsik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).