netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* libmnl build system patches
@ 2010-10-19 10:47 Jan Engelhardt
  2010-10-19 10:47 ` [PATCH 01/10] build: just use autoreconf Jan Engelhardt
                   ` (10 more replies)
  0 siblings, 11 replies; 15+ messages in thread
From: Jan Engelhardt @ 2010-10-19 10:47 UTC (permalink / raw)
  To: pablo; +Cc: netfilter-devel


The following changes since commit e7fa7219245809491fedfd9efcbe50b6c839f734:

  add quote from Thoureau to documentation (2010-10-10 13:53:22 +0200)

are available in the git repository at:
  git://dev.medozas.de/libmnl master

Jan Engelhardt (10):
      build: just use autoreconf
      build: do not abuse AM_INIT_AUTOMAKE for autoconf options
      build: automake options should be in AM_INIT_AUTOMAKE
      build: use subdir-objects and CC_C_O
      build: run autoupdate
      build: rebuild .pc files when configure status changed
      build: resolve compiler warnings
      build: remove unneeded -dynamic -ldl -nostartfiles flags
      build: default to not build static libraries
      Add .gitignore files

 .gitignore                     |   23 +++++++++++++++++++++++
 Make_global.am                 |    2 +-
 Makefile.am                    |    3 ++-
 autogen.sh                     |   18 ++----------------
 configure.ac                   |   21 +++++++++++++++++++++
 configure.in                   |   18 ------------------
 examples/genl/.gitignore       |    1 +
 examples/genl/Makefile.am      |    1 -
 examples/netfilter/.gitignore  |    2 ++
 examples/netfilter/Makefile.am |    2 --
 examples/rtnl/.gitignore       |    7 +++++++
 examples/rtnl/Makefile.am      |    7 -------
 src/Makefile.am                |    4 +---
 src/nlmsg.c                    |    2 +-
 14 files changed, 61 insertions(+), 50 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 configure.ac
 delete mode 100644 configure.in
 create mode 100644 examples/genl/.gitignore
 create mode 100644 examples/netfilter/.gitignore
 create mode 100644 examples/rtnl/.gitignore

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 01/10] build: just use autoreconf
  2010-10-19 10:47 libmnl build system patches Jan Engelhardt
@ 2010-10-19 10:47 ` Jan Engelhardt
  2010-10-19 10:47 ` [PATCH 02/10] build: do not abuse AM_INIT_AUTOMAKE for autoconf options Jan Engelhardt
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 15+ messages in thread
From: Jan Engelhardt @ 2010-10-19 10:47 UTC (permalink / raw)
  To: pablo; +Cc: netfilter-devel

This is the recommended way to regenerate the GNU build system files
these days.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 autogen.sh |   18 ++----------------
 1 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index ccce4f0..72240f7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,18 +1,4 @@
 #!/bin/sh
 
-run ()
-{
-    echo "running: $*"
-    eval $*
-
-    if test $? != 0 ; then
-	echo "error: while running '$*'"
-	exit 1
-    fi
-}
-
-run aclocal
-#run autoheader
-run libtoolize -f
-run automake -a
-run autoconf
+autoreconf -fi
+rm -Rf autom4te.cache
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH 02/10] build: do not abuse AM_INIT_AUTOMAKE for autoconf options
  2010-10-19 10:47 libmnl build system patches Jan Engelhardt
  2010-10-19 10:47 ` [PATCH 01/10] build: just use autoreconf Jan Engelhardt
@ 2010-10-19 10:47 ` Jan Engelhardt
  2010-10-19 10:47 ` [PATCH 03/10] build: automake options should be in AM_INIT_AUTOMAKE Jan Engelhardt
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 15+ messages in thread
From: Jan Engelhardt @ 2010-10-19 10:47 UTC (permalink / raw)
  To: pablo; +Cc: netfilter-devel

Also rename the file to its standard designated name.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 configure.ac |   18 ++++++++++++++++++
 configure.in |   18 ------------------
 2 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 configure.ac
 delete mode 100644 configure.in

diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..5cbbdfd
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,18 @@
+dnl Process this file with autoconf to create configure.
+
+AC_INIT([libmnl], [1.0.0-beta0])
+AC_CANONICAL_SYSTEM
+AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE
+
+AC_PROG_CC
+AC_EXEEXT
+AM_PROG_LIBTOOL
+AC_SUBST(LIBTOOL_DEPS)
+
+case $target in 
+*-*-linux*) ;;
+*) AC_MSG_ERROR([Linux only, dude!]);;
+esac
+
+AC_OUTPUT(Makefile src/Makefile include/Makefile include/libmnl/Makefile examples/Makefile examples/genl/Makefile examples/netfilter/Makefile examples/rtnl/Makefile libmnl.pc doxygen.cfg)
diff --git a/configure.in b/configure.in
deleted file mode 100644
index 8f2287e..0000000
--- a/configure.in
+++ /dev/null
@@ -1,18 +0,0 @@
-dnl Process this file with autoconf to create configure.
-
-AC_INIT
-AC_CANONICAL_SYSTEM
-AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE(libmnl, 1.0.0-beta0)
-
-AC_PROG_CC
-AC_EXEEXT
-AM_PROG_LIBTOOL
-AC_SUBST(LIBTOOL_DEPS)
-
-case $target in 
-*-*-linux*) ;;
-*) AC_MSG_ERROR([Linux only, dude!]);;
-esac
-
-AC_OUTPUT(Makefile src/Makefile include/Makefile include/libmnl/Makefile examples/Makefile examples/genl/Makefile examples/netfilter/Makefile examples/rtnl/Makefile libmnl.pc doxygen.cfg)
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH 03/10] build: automake options should be in AM_INIT_AUTOMAKE
  2010-10-19 10:47 libmnl build system patches Jan Engelhardt
  2010-10-19 10:47 ` [PATCH 01/10] build: just use autoreconf Jan Engelhardt
  2010-10-19 10:47 ` [PATCH 02/10] build: do not abuse AM_INIT_AUTOMAKE for autoconf options Jan Engelhardt
@ 2010-10-19 10:47 ` Jan Engelhardt
  2010-10-19 10:47 ` [PATCH 04/10] build: use subdir-objects and CC_C_O Jan Engelhardt
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 15+ messages in thread
From: Jan Engelhardt @ 2010-10-19 10:47 UTC (permalink / raw)
  To: pablo; +Cc: netfilter-devel

Automake options set in Makefile.am are not always propagated to
subdirecties.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 Makefile.am  |    1 -
 configure.ac |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index baeae1a..35bfbe2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
 include $(top_srcdir)/Make_global.am
 
-AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = src include examples
diff --git a/configure.ac b/configure.ac
index 5cbbdfd..dfdd098 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to create configure.
 AC_INIT([libmnl], [1.0.0-beta0])
 AC_CANONICAL_SYSTEM
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign dist-bzip2 1.6])
 
 AC_PROG_CC
 AC_EXEEXT
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH 04/10] build: use subdir-objects and CC_C_O
  2010-10-19 10:47 libmnl build system patches Jan Engelhardt
                   ` (2 preceding siblings ...)
  2010-10-19 10:47 ` [PATCH 03/10] build: automake options should be in AM_INIT_AUTOMAKE Jan Engelhardt
@ 2010-10-19 10:47 ` Jan Engelhardt
  2010-10-19 10:47 ` [PATCH 05/10] build: run autoupdate Jan Engelhardt
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 15+ messages in thread
From: Jan Engelhardt @ 2010-10-19 10:47 UTC (permalink / raw)
  To: pablo; +Cc: netfilter-devel

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 configure.ac |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index dfdd098..6a199c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,9 +3,10 @@ dnl Process this file with autoconf to create configure.
 AC_INIT([libmnl], [1.0.0-beta0])
 AC_CANONICAL_SYSTEM
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([foreign dist-bzip2 1.6])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 1.6 subdir-objects])
 
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_EXEEXT
 AM_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH 05/10] build: run autoupdate
  2010-10-19 10:47 libmnl build system patches Jan Engelhardt
                   ` (3 preceding siblings ...)
  2010-10-19 10:47 ` [PATCH 04/10] build: use subdir-objects and CC_C_O Jan Engelhardt
@ 2010-10-19 10:47 ` Jan Engelhardt
  2010-10-19 10:47 ` [PATCH 06/10] build: rebuild .pc files when configure status changed Jan Engelhardt
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 15+ messages in thread
From: Jan Engelhardt @ 2010-10-19 10:47 UTC (permalink / raw)
  To: pablo; +Cc: netfilter-devel

Macro usage has changed over the last few years. Update it to the
current specification using autoupdate(1).

Manually update INCLUDES -> CPPFLAGS, because autoupdate did not
catch that.

Remove $(all_includes) and $(LIBS) because it is not used anywhere.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 Make_global.am  |    2 +-
 configure.ac    |    7 ++++---
 src/Makefile.am |    2 --
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Make_global.am b/Make_global.am
index 4d56685..78a0e35 100644
--- a/Make_global.am
+++ b/Make_global.am
@@ -20,5 +20,5 @@
 #
 LIBVERSION=0:0:0
 
-INCLUDES=$(all_includes) -I$(top_srcdir)/include
+CPPFLAGS = -I$(top_srcdir)/include
 AM_CFLAGS=-fPIC -Wall -Wextra -Wno-unused-parameter
diff --git a/configure.ac b/configure.ac
index 6a199c4..d9567ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,14 +1,14 @@
 dnl Process this file with autoconf to create configure.
 
 AC_INIT([libmnl], [1.0.0-beta0])
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_TARGET
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign dist-bzip2 1.6 subdir-objects])
 
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_EXEEXT
-AM_PROG_LIBTOOL
+LT_INIT
 AC_SUBST(LIBTOOL_DEPS)
 
 case $target in 
@@ -16,4 +16,5 @@ case $target in
 *) AC_MSG_ERROR([Linux only, dude!]);;
 esac
 
-AC_OUTPUT(Makefile src/Makefile include/Makefile include/libmnl/Makefile examples/Makefile examples/genl/Makefile examples/netfilter/Makefile examples/rtnl/Makefile libmnl.pc doxygen.cfg)
+AC_CONFIG_FILES([Makefile src/Makefile include/Makefile include/libmnl/Makefile examples/Makefile examples/genl/Makefile examples/netfilter/Makefile examples/rtnl/Makefile libmnl.pc doxygen.cfg])
+AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index 72ccb0c..1e34c0f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,5 @@
 include $(top_srcdir)/Make_global.am
 
-LIBS=
-
 lib_LTLIBRARIES = libmnl.la
 
 libmnl_la_LDFLAGS = -Wc,-nostartfiles -version-info $(LIBVERSION)
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH 06/10] build: rebuild .pc files when configure status changed
  2010-10-19 10:47 libmnl build system patches Jan Engelhardt
                   ` (4 preceding siblings ...)
  2010-10-19 10:47 ` [PATCH 05/10] build: run autoupdate Jan Engelhardt
@ 2010-10-19 10:47 ` Jan Engelhardt
  2010-10-19 12:14   ` Amos Jeffries
  2010-10-19 10:47 ` [PATCH 07/10] build: resolve compiler warnings Jan Engelhardt
                   ` (4 subsequent siblings)
  10 siblings, 1 reply; 15+ messages in thread
From: Jan Engelhardt @ 2010-10-19 10:47 UTC (permalink / raw)
  To: pablo; +Cc: netfilter-devel

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 Makefile.am |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 35bfbe2..6d5b8dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,8 @@ DIST_SUBDIRS = src include examples
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libmnl.pc
 
+${pkgconfig_DATA}: ${top_builddir}/config.status
+
 $(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH 07/10] build: resolve compiler warnings
  2010-10-19 10:47 libmnl build system patches Jan Engelhardt
                   ` (5 preceding siblings ...)
  2010-10-19 10:47 ` [PATCH 06/10] build: rebuild .pc files when configure status changed Jan Engelhardt
@ 2010-10-19 10:47 ` Jan Engelhardt
  2010-10-19 10:47 ` [PATCH 08/10] build: remove unneeded -dynamic -ldl -nostartfiles flags Jan Engelhardt
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 15+ messages in thread
From: Jan Engelhardt @ 2010-10-19 10:47 UTC (permalink / raw)
  To: pablo; +Cc: netfilter-devel

nlmsg.c: In function "mnl_nlmsg_fprintf":
nlmsg.c:260:4: warning: format "%.3d" expects type "int", but
argument 3 has type "size_t"

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 src/nlmsg.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/nlmsg.c b/src/nlmsg.c
index af08671..3cec2a2 100644
--- a/src/nlmsg.c
+++ b/src/nlmsg.c
@@ -255,7 +255,7 @@ void mnl_nlmsg_fprintf(FILE *fd, const struct nlmsghdr *nlh)
 	for (i=sizeof(struct nlmsghdr); i<nlh->nlmsg_len; i+=4) {
 		char *b = (char *) nlh;
 
-		fprintf(fd, "(%.3d) %.2x %.2x %.2x %.2x | ", i,
+		fprintf(fd, "(%03zu) %.2x %.2x %.2x %.2x | ", i,
 			0xff & b[i],	0xff & b[i+1],
 			0xff & b[i+2],	0xff & b[i+3]);
 
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH 08/10] build: remove unneeded -dynamic -ldl -nostartfiles flags
  2010-10-19 10:47 libmnl build system patches Jan Engelhardt
                   ` (6 preceding siblings ...)
  2010-10-19 10:47 ` [PATCH 07/10] build: resolve compiler warnings Jan Engelhardt
@ 2010-10-19 10:47 ` Jan Engelhardt
  2010-10-19 10:47 ` [PATCH 09/10] build: default to not build static libraries Jan Engelhardt
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 15+ messages in thread
From: Jan Engelhardt @ 2010-10-19 10:47 UTC (permalink / raw)
  To: pablo; +Cc: netfilter-devel

Besides that -ldl should be in _LDADD (not _LDFLAGS), I do not see any
dlopen calls at all that would make the library a requirement.

I also see no reason to use -Wc,-nostartfiles.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 examples/genl/Makefile.am      |    1 -
 examples/netfilter/Makefile.am |    2 --
 examples/rtnl/Makefile.am      |    7 -------
 src/Makefile.am                |    2 +-
 4 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/examples/genl/Makefile.am b/examples/genl/Makefile.am
index a2df116..deaf18d 100644
--- a/examples/genl/Makefile.am
+++ b/examples/genl/Makefile.am
@@ -4,4 +4,3 @@ check_PROGRAMS = genl-family-get
 
 genl_family_get_SOURCES = genl-family-get.c
 genl_family_get_LDADD = ../../src/libmnl.la
-genl_family_get_LDFLAGS = -dynamic -ldl
diff --git a/examples/netfilter/Makefile.am b/examples/netfilter/Makefile.am
index ef2f10c..927eb38 100644
--- a/examples/netfilter/Makefile.am
+++ b/examples/netfilter/Makefile.am
@@ -5,8 +5,6 @@ check_PROGRAMS = nf-queue \
 
 nf_queue_SOURCES = nf-queue.c
 nf_queue_LDADD = ../../src/libmnl.la
-nf_queue_LDFLAGS = -dynamic -ldl
 
 nfct_event_SOURCES = nfct-event.c
 nfct_event_LDADD = ../../src/libmnl.la
-nfct_event_LDFLAGS = -dynamic -ldl
diff --git a/examples/rtnl/Makefile.am b/examples/rtnl/Makefile.am
index 9f0600d..3cc8995 100644
--- a/examples/rtnl/Makefile.am
+++ b/examples/rtnl/Makefile.am
@@ -8,28 +8,21 @@ check_PROGRAMS = rtnl-link-dump rtnl-link-dump2 rtnl-link-dump3 \
 
 rtnl_link_dump_SOURCES = rtnl-link-dump.c
 rtnl_link_dump_LDADD = ../../src/libmnl.la
-rtnl_link_dump_LDFLAGS = -dynamic -ldl
 
 rtnl_link_dump2_SOURCES = rtnl-link-dump2.c
 rtnl_link_dump2_LDADD = ../../src/libmnl.la
-rtnl_link_dump2_LDFLAGS = -dynamic -ldl
 
 rtnl_link_dump3_SOURCES = rtnl-link-dump3.c
 rtnl_link_dump3_LDADD = ../../src/libmnl.la
-rtnl_link_dump3_LDFLAGS = -dynamic -ldl
 
 rtnl_route_add_SOURCES = rtnl-route-add.c
 rtnl_route_add_LDADD = ../../src/libmnl.la
-rtnl_route_add_LDFLAGS = -dynamic -ldl
 
 rtnl_link_event_SOURCES = rtnl-link-event.c
 rtnl_link_event_LDADD = ../../src/libmnl.la
-rtnl_link_event_LDFLAGS = -dynamic -ldl
 
 rtnl_link_set_SOURCES = rtnl-link-set.c
 rtnl_link_set_LDADD = ../../src/libmnl.la
-rtnl_link_set_LDFLAGS = -dynamic -ldl
 
 rtnl_route_dump_SOURCES = rtnl-route-dump.c
 rtnl_route_dump_LDADD = ../../src/libmnl.la
-rtnl_route_dump_LDFLAGS = -dynamic -ldl
diff --git a/src/Makefile.am b/src/Makefile.am
index 1e34c0f..064ccf5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,5 +2,5 @@ include $(top_srcdir)/Make_global.am
 
 lib_LTLIBRARIES = libmnl.la
 
-libmnl_la_LDFLAGS = -Wc,-nostartfiles -version-info $(LIBVERSION)
+libmnl_la_LDFLAGS = -version-info $(LIBVERSION)
 libmnl_la_SOURCES = socket.c callback.c nlmsg.c attr.c
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH 09/10] build: default to not build static libraries
  2010-10-19 10:47 libmnl build system patches Jan Engelhardt
                   ` (7 preceding siblings ...)
  2010-10-19 10:47 ` [PATCH 08/10] build: remove unneeded -dynamic -ldl -nostartfiles flags Jan Engelhardt
@ 2010-10-19 10:47 ` Jan Engelhardt
  2010-10-19 10:47 ` [PATCH 10/10] Add .gitignore files Jan Engelhardt
  2010-10-20  9:37 ` libmnl build system patches Pablo Neira Ayuso
  10 siblings, 0 replies; 15+ messages in thread
From: Jan Engelhardt @ 2010-10-19 10:47 UTC (permalink / raw)
  To: pablo; +Cc: netfilter-devel

Users wanting static libraries can just use
./configure --enable-static.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 configure.ac |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index d9567ea..dbb6ae3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,7 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_EXEEXT
 LT_INIT
+AC_DISABLE_STATIC
 AC_SUBST(LIBTOOL_DEPS)
 
 case $target in 
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH 10/10] Add .gitignore files
  2010-10-19 10:47 libmnl build system patches Jan Engelhardt
                   ` (8 preceding siblings ...)
  2010-10-19 10:47 ` [PATCH 09/10] build: default to not build static libraries Jan Engelhardt
@ 2010-10-19 10:47 ` Jan Engelhardt
  2010-10-20  9:37 ` libmnl build system patches Pablo Neira Ayuso
  10 siblings, 0 replies; 15+ messages in thread
From: Jan Engelhardt @ 2010-10-19 10:47 UTC (permalink / raw)
  To: pablo; +Cc: netfilter-devel

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 .gitignore                    |   23 +++++++++++++++++++++++
 examples/genl/.gitignore      |    1 +
 examples/netfilter/.gitignore |    2 ++
 examples/rtnl/.gitignore      |    7 +++++++
 4 files changed, 33 insertions(+), 0 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 examples/genl/.gitignore
 create mode 100644 examples/netfilter/.gitignore
 create mode 100644 examples/rtnl/.gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..04462c0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,23 @@
+*~
+*.la
+*.lo
+*.o
+.deps
+.libs
+Makefile
+Makefile.in
+
+/aclocal.m4
+/autom4te.cache
+/compile
+/config.*
+/configure
+/depcomp
+/install-sh
+/libtool
+/ltmain.sh
+/missing
+/stamp-h1
+
+/doxygen.cfg
+/libmnl.pc
diff --git a/examples/genl/.gitignore b/examples/genl/.gitignore
new file mode 100644
index 0000000..57f0ca9
--- /dev/null
+++ b/examples/genl/.gitignore
@@ -0,0 +1 @@
+/genl-family-get
diff --git a/examples/netfilter/.gitignore b/examples/netfilter/.gitignore
new file mode 100644
index 0000000..0d1727d
--- /dev/null
+++ b/examples/netfilter/.gitignore
@@ -0,0 +1,2 @@
+/nf-queue
+/nfct-event
diff --git a/examples/rtnl/.gitignore b/examples/rtnl/.gitignore
new file mode 100644
index 0000000..b03a27d
--- /dev/null
+++ b/examples/rtnl/.gitignore
@@ -0,0 +1,7 @@
+/rtnl-link-dump
+/rtnl-link-dump2
+/rtnl-link-dump3
+/rtnl-link-event
+/rtnl-link-set
+/rtnl-route-add
+/rtnl-route-dump
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* Re: [PATCH 06/10] build: rebuild .pc files when configure status changed
  2010-10-19 10:47 ` [PATCH 06/10] build: rebuild .pc files when configure status changed Jan Engelhardt
@ 2010-10-19 12:14   ` Amos Jeffries
  2010-10-19 13:30     ` Jan Engelhardt
  0 siblings, 1 reply; 15+ messages in thread
From: Amos Jeffries @ 2010-10-19 12:14 UTC (permalink / raw)
  To: Jan Engelhardt; +Cc: pablo, netfilter-devel

On 19/10/10 23:47, Jan Engelhardt wrote:
> Signed-off-by: Jan Engelhardt<jengelh@medozas.de>
> ---
>   Makefile.am |    2 ++
>   1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index 35bfbe2..6d5b8dd 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -8,6 +8,8 @@ DIST_SUBDIRS = src include examples
>   pkgconfigdir = $(libdir)/pkgconfig
>   pkgconfig_DATA = libmnl.pc
>
> +${pkgconfig_DATA}: ${top_builddir}/config.status
> +
>   $(OBJECTS): libtool
>   libtool: $(LIBTOOL_DEPS)
>   	$(SHELL) ./config.status --recheck

IIRC {} is a bashism. () is more portable for automake.

AYJ

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 06/10] build: rebuild .pc files when configure status changed
  2010-10-19 12:14   ` Amos Jeffries
@ 2010-10-19 13:30     ` Jan Engelhardt
  2010-10-19 21:41       ` Amos Jeffries
  0 siblings, 1 reply; 15+ messages in thread
From: Jan Engelhardt @ 2010-10-19 13:30 UTC (permalink / raw)
  To: Amos Jeffries; +Cc: pablo, netfilter-devel

On Tuesday 2010-10-19 14:14, Amos Jeffries wrote:

> On 19/10/10 23:47, Jan Engelhardt wrote:
>> Signed-off-by: Jan Engelhardt<jengelh@medozas.de>
>> ---
>>  Makefile.am |    2 ++
>>  1 files changed, 2 insertions(+), 0 deletions(-)
>>
>> diff --git a/Makefile.am b/Makefile.am
>> index 35bfbe2..6d5b8dd 100644
>> --- a/Makefile.am
>> +++ b/Makefile.am
>> @@ -8,6 +8,8 @@ DIST_SUBDIRS = src include examples
>>  pkgconfigdir = $(libdir)/pkgconfig
>>  pkgconfig_DATA = libmnl.pc
>>
>> +${pkgconfig_DATA}: ${top_builddir}/config.status
>> +
>>  $(OBJECTS): libtool
>>  libtool: $(LIBTOOL_DEPS)
>>  	$(SHELL) ./config.status --recheck
>
> IIRC {} is a bashism. () is more portable for automake.

What are you talking about? ${...} is not a bash-only feature.
The automake developers certainly did not complain about the use
of {} when I submitted my patches.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 06/10] build: rebuild .pc files when configure status changed
  2010-10-19 13:30     ` Jan Engelhardt
@ 2010-10-19 21:41       ` Amos Jeffries
  0 siblings, 0 replies; 15+ messages in thread
From: Amos Jeffries @ 2010-10-19 21:41 UTC (permalink / raw)
  To: Jan Engelhardt; +Cc: netfilter-devel

On Tue, 19 Oct 2010 15:30:56 +0200 (CEST), Jan Engelhardt
<jengelh@medozas.de> wrote:
> On Tuesday 2010-10-19 14:14, Amos Jeffries wrote:
> 
>> On 19/10/10 23:47, Jan Engelhardt wrote:
>>> Signed-off-by: Jan Engelhardt<jengelh@medozas.de>
>>> ---
>>>  Makefile.am |    2 ++
>>>  1 files changed, 2 insertions(+), 0 deletions(-)
>>>
>>> diff --git a/Makefile.am b/Makefile.am
>>> index 35bfbe2..6d5b8dd 100644
>>> --- a/Makefile.am
>>> +++ b/Makefile.am
>>> @@ -8,6 +8,8 @@ DIST_SUBDIRS = src include examples
>>>  pkgconfigdir = $(libdir)/pkgconfig
>>>  pkgconfig_DATA = libmnl.pc
>>>
>>> +${pkgconfig_DATA}: ${top_builddir}/config.status
>>> +
>>>  $(OBJECTS): libtool
>>>  libtool: $(LIBTOOL_DEPS)
>>>  	$(SHELL) ./config.status --recheck
>>
>> IIRC {} is a bashism. () is more portable for automake.
> 
> What are you talking about? ${...} is not a bash-only feature.
> The automake developers certainly did not complain about the use
> of {} when I submitted my patches.

Okay, they would know best. I'm probably recallling non-linux automakes.
Sorry for the noise.

AYJ

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: libmnl build system patches
  2010-10-19 10:47 libmnl build system patches Jan Engelhardt
                   ` (9 preceding siblings ...)
  2010-10-19 10:47 ` [PATCH 10/10] Add .gitignore files Jan Engelhardt
@ 2010-10-20  9:37 ` Pablo Neira Ayuso
  10 siblings, 0 replies; 15+ messages in thread
From: Pablo Neira Ayuso @ 2010-10-20  9:37 UTC (permalink / raw)
  To: Jan Engelhardt; +Cc: netfilter-devel

On 19/10/10 12:47, Jan Engelhardt wrote:
> git://dev.medozas.de/libmnl master

Pulled and pushed, thanks Jan!

^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2010-10-20  9:38 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-19 10:47 libmnl build system patches Jan Engelhardt
2010-10-19 10:47 ` [PATCH 01/10] build: just use autoreconf Jan Engelhardt
2010-10-19 10:47 ` [PATCH 02/10] build: do not abuse AM_INIT_AUTOMAKE for autoconf options Jan Engelhardt
2010-10-19 10:47 ` [PATCH 03/10] build: automake options should be in AM_INIT_AUTOMAKE Jan Engelhardt
2010-10-19 10:47 ` [PATCH 04/10] build: use subdir-objects and CC_C_O Jan Engelhardt
2010-10-19 10:47 ` [PATCH 05/10] build: run autoupdate Jan Engelhardt
2010-10-19 10:47 ` [PATCH 06/10] build: rebuild .pc files when configure status changed Jan Engelhardt
2010-10-19 12:14   ` Amos Jeffries
2010-10-19 13:30     ` Jan Engelhardt
2010-10-19 21:41       ` Amos Jeffries
2010-10-19 10:47 ` [PATCH 07/10] build: resolve compiler warnings Jan Engelhardt
2010-10-19 10:47 ` [PATCH 08/10] build: remove unneeded -dynamic -ldl -nostartfiles flags Jan Engelhardt
2010-10-19 10:47 ` [PATCH 09/10] build: default to not build static libraries Jan Engelhardt
2010-10-19 10:47 ` [PATCH 10/10] Add .gitignore files Jan Engelhardt
2010-10-20  9:37 ` libmnl build system patches Pablo Neira Ayuso

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).