* [PATCH 01/11] build: use autoconf-suggested naming of files
2010-10-30 22:09 libnetfilter_log: build system cleanups Jan Engelhardt
@ 2010-10-30 22:09 ` Jan Engelhardt
2010-10-30 22:09 ` [PATCH 02/11] build: use modern call syntax for AC_INIT, AM_INIT_AUTOMAKE Jan Engelhardt
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Jan Engelhardt @ 2010-10-30 22:09 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
configure.ac | 35 +++++++++++++++++++++++++++++++++++
configure.in | 35 -----------------------------------
2 files changed, 35 insertions(+), 35 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..e0e1a41
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,35 @@
+dnl Process this file with autoconf to create configure.
+
+AC_INIT
+
+AC_CANONICAL_SYSTEM
+AC_CONFIG_MACRO_DIR([m4])
+
+AM_INIT_AUTOMAKE(libnetfilter_log, 1.0.0)
+
+AC_PROG_CC
+AM_PROG_LIBTOOL
+AC_PROG_INSTALL
+AC_PROG_LN_S
+
+AC_SUBST(LIBTOOL_DEPS)
+
+case $target in
+*-*-linux*) ;;
+*) AC_MSG_ERROR([Linux only, dude!]);;
+esac
+
+dnl Dependencies
+LIBNFNETLINK_REQUIRED=0.0.41
+
+PKG_CHECK_MODULES(LIBNFNETLINK, libnfnetlink >= $LIBNFNETLINK_REQUIRED,,
+ AC_MSG_ERROR(Cannot find libnfnetlink >= $LIBNFNETLINK_REQUIRED))
+
+CFLAGS="$CFLAGS $LIBNFNETLINK_CFLAGS"
+LIBNFLOG_LIBS="$LIBNFNETLINK_LIBS"
+
+AC_SUBST(LIBNFLOG_LIBS)
+
+dnl Output the makefile
+AC_OUTPUT(Makefile src/Makefile include/Makefile include/libnetfilter_log/Makefile utils/Makefile libnetfilter_log.pc doxygen.cfg)
+
diff --git a/configure.in b/configure.in
deleted file mode 100644
index e0e1a41..0000000
--- a/configure.in
+++ /dev/null
@@ -1,35 +0,0 @@
-dnl Process this file with autoconf to create configure.
-
-AC_INIT
-
-AC_CANONICAL_SYSTEM
-AC_CONFIG_MACRO_DIR([m4])
-
-AM_INIT_AUTOMAKE(libnetfilter_log, 1.0.0)
-
-AC_PROG_CC
-AM_PROG_LIBTOOL
-AC_PROG_INSTALL
-AC_PROG_LN_S
-
-AC_SUBST(LIBTOOL_DEPS)
-
-case $target in
-*-*-linux*) ;;
-*) AC_MSG_ERROR([Linux only, dude!]);;
-esac
-
-dnl Dependencies
-LIBNFNETLINK_REQUIRED=0.0.41
-
-PKG_CHECK_MODULES(LIBNFNETLINK, libnfnetlink >= $LIBNFNETLINK_REQUIRED,,
- AC_MSG_ERROR(Cannot find libnfnetlink >= $LIBNFNETLINK_REQUIRED))
-
-CFLAGS="$CFLAGS $LIBNFNETLINK_CFLAGS"
-LIBNFLOG_LIBS="$LIBNFNETLINK_LIBS"
-
-AC_SUBST(LIBNFLOG_LIBS)
-
-dnl Output the makefile
-AC_OUTPUT(Makefile src/Makefile include/Makefile include/libnetfilter_log/Makefile utils/Makefile libnetfilter_log.pc doxygen.cfg)
-
--
1.7.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 02/11] build: use modern call syntax for AC_INIT, AM_INIT_AUTOMAKE
2010-10-30 22:09 libnetfilter_log: build system cleanups Jan Engelhardt
2010-10-30 22:09 ` [PATCH 01/11] build: use autoconf-suggested naming of files Jan Engelhardt
@ 2010-10-30 22:09 ` Jan Engelhardt
2010-10-30 22:09 ` [PATCH 03/11] build: avoid use of deprecated INCLUDES Jan Engelhardt
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Jan Engelhardt @ 2010-10-30 22:09 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
automake options also need to definitely go into configure.ac,
otherwise they only apply to a single directory.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
Makefile.am | 2 --
configure.ac | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 348cfc6..eb7d586 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
-
INCLUDES =$(all_includes) -I$(top_srcdir)/include
SUBDIRS = include src utils
LINKOPTS = -lnfnetlink
diff --git a/configure.ac b/configure.ac
index e0e1a41..c9b39a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
dnl Process this file with autoconf to create configure.
-AC_INIT
+AC_INIT([libnetfilter_log], [1.0.0])
AC_CANONICAL_SYSTEM
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE(libnetfilter_log, 1.0.0)
+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects dist-bzip2 1.6])
AC_PROG_CC
AM_PROG_LIBTOOL
--
1.7.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 03/11] build: avoid use of deprecated INCLUDES
2010-10-30 22:09 libnetfilter_log: build system cleanups Jan Engelhardt
2010-10-30 22:09 ` [PATCH 01/11] build: use autoconf-suggested naming of files Jan Engelhardt
2010-10-30 22:09 ` [PATCH 02/11] build: use modern call syntax for AC_INIT, AM_INIT_AUTOMAKE Jan Engelhardt
@ 2010-10-30 22:09 ` Jan Engelhardt
2010-10-30 22:09 ` [PATCH 04/11] build: use simpler autoreconf in autogen Jan Engelhardt
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Jan Engelhardt @ 2010-10-30 22:09 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
And remove unused $(all_includes).
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
Makefile.am | 2 +-
src/Makefile.am | 2 +-
utils/Makefile.am | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index eb7d586..c6e1154 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =$(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
SUBDIRS = include src utils
LINKOPTS = -lnfnetlink
diff --git a/src/Makefile.am b/src/Makefile.am
index 62e877b..65eedf5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,7 @@
#
LIBVERSION=2:0:1
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CFLAGS = -fPIC -Wall
LIBS = @LIBNFLOG_LIBS@
diff --git a/utils/Makefile.am b/utils/Makefile.am
index f405dbf..b6c333b 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
check_PROGRAMS = nfulnl_test ulog_test
--
1.7.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 04/11] build: use simpler autoreconf in autogen
2010-10-30 22:09 libnetfilter_log: build system cleanups Jan Engelhardt
` (2 preceding siblings ...)
2010-10-30 22:09 ` [PATCH 03/11] build: avoid use of deprecated INCLUDES Jan Engelhardt
@ 2010-10-30 22:09 ` Jan Engelhardt
2010-10-30 22:09 ` [PATCH 05/11] build: run AC_CANONICAL_HOST only Jan Engelhardt
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Jan Engelhardt @ 2010-10-30 22:09 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
autogen.sh | 20 +++-----------------
1 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index b962504..ce22b64 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
include ()
{
@@ -34,20 +34,6 @@ include ()
fi
}
-run ()
-{
- echo "running: $*"
- eval $*
-
- if test $? != 0 ; then
- echo "error: while running '$*'"
- exit 1
- fi
-}
-
[ "x$1" == "xdistrib" ] && include
-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] 13+ messages in thread* [PATCH 05/11] build: run AC_CANONICAL_HOST only
2010-10-30 22:09 libnetfilter_log: build system cleanups Jan Engelhardt
` (3 preceding siblings ...)
2010-10-30 22:09 ` [PATCH 04/11] build: use simpler autoreconf in autogen Jan Engelhardt
@ 2010-10-30 22:09 ` Jan Engelhardt
2010-10-30 22:09 ` [PATCH 06/11] build: remove statements without effect Jan Engelhardt
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Jan Engelhardt @ 2010-10-30 22:09 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
There is no need to call AC_CANONICAL_SYSTEM when only
AC_CANONICAL_HOST is needed. Also, checking for $target is factually
incorrect, since we do not produce object code like a compiler. Use
$host, which specifies the triple/quadruple where the compiled program
is supposed to run.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
configure.ac | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index c9b39a0..7fa3566 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to create configure.
AC_INIT([libnetfilter_log], [1.0.0])
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([-Wall foreign subdir-objects dist-bzip2 1.6])
@@ -14,7 +14,7 @@ AC_PROG_LN_S
AC_SUBST(LIBTOOL_DEPS)
-case $target in
+case "$host" in
*-*-linux*) ;;
*) AC_MSG_ERROR([Linux only, dude!]);;
esac
--
1.7.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 06/11] build: remove statements without effect
2010-10-30 22:09 libnetfilter_log: build system cleanups Jan Engelhardt
` (4 preceding siblings ...)
2010-10-30 22:09 ` [PATCH 05/11] build: run AC_CANONICAL_HOST only Jan Engelhardt
@ 2010-10-30 22:09 ` Jan Engelhardt
2010-10-30 22:09 ` [PATCH 07/11] build: remove -fPIC flag Jan Engelhardt
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Jan Engelhardt @ 2010-10-30 22:09 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
Makefile.am | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index c6e1154..d001fba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,3 @@ man_MANS = #nfnetlink_log.3 nfnetlink_log.7
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libnetfilter_log.pc
-
-$(OBJECTS): libtool
-libtool: $(LIBTOOL_DEPS)
- $(SHELL) ./config.status --recheck
--
1.7.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 07/11] build: remove -fPIC flag
2010-10-30 22:09 libnetfilter_log: build system cleanups Jan Engelhardt
` (5 preceding siblings ...)
2010-10-30 22:09 ` [PATCH 06/11] build: remove statements without effect Jan Engelhardt
@ 2010-10-30 22:09 ` Jan Engelhardt
2010-10-30 22:09 ` [PATCH 08/11] build: no need for error message in PKG_CHECK_MODULES Jan Engelhardt
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Jan Engelhardt @ 2010-10-30 22:09 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
libtool automatically adds PIC flags as needed.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
src/Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 65eedf5..5668473 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@
LIBVERSION=2:0:1
AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = -fPIC -Wall
+AM_CFLAGS = -Wall
LIBS = @LIBNFLOG_LIBS@
lib_LTLIBRARIES = libnetfilter_log.la libnetfilter_log_libipulog.la
--
1.7.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 08/11] build: no need for error message in PKG_CHECK_MODULES
2010-10-30 22:09 libnetfilter_log: build system cleanups Jan Engelhardt
` (6 preceding siblings ...)
2010-10-30 22:09 ` [PATCH 07/11] build: remove -fPIC flag Jan Engelhardt
@ 2010-10-30 22:09 ` Jan Engelhardt
2010-10-30 22:09 ` [PATCH 09/11] build: set Libs.private for pkgconfig file Jan Engelhardt
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Jan Engelhardt @ 2010-10-30 22:09 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
PKG_CHECK_MODULES already produces its own (and more verbose) messsage
when a module cannot be found.
Mucking around with CFLAGS and LIBS is also not needed since pkgconfig
takes care of providing variables, so let's use them in Makefile.am.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
configure.ac | 10 +---------
src/Makefile.am | 4 ++--
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7fa3566..4e1dd6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,15 +20,7 @@ case "$host" in
esac
dnl Dependencies
-LIBNFNETLINK_REQUIRED=0.0.41
-
-PKG_CHECK_MODULES(LIBNFNETLINK, libnfnetlink >= $LIBNFNETLINK_REQUIRED,,
- AC_MSG_ERROR(Cannot find libnfnetlink >= $LIBNFNETLINK_REQUIRED))
-
-CFLAGS="$CFLAGS $LIBNFNETLINK_CFLAGS"
-LIBNFLOG_LIBS="$LIBNFNETLINK_LIBS"
-
-AC_SUBST(LIBNFLOG_LIBS)
+PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 0.0.41])
dnl Output the makefile
AC_OUTPUT(Makefile src/Makefile include/Makefile include/libnetfilter_log/Makefile utils/Makefile libnetfilter_log.pc doxygen.cfg)
diff --git a/src/Makefile.am b/src/Makefile.am
index 5668473..e78faa8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,14 +21,14 @@
LIBVERSION=2:0:1
AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = -Wall
-LIBS = @LIBNFLOG_LIBS@
+AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS}
lib_LTLIBRARIES = libnetfilter_log.la libnetfilter_log_libipulog.la
libnetfilter_log_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink \
-version-info $(LIBVERSION)
libnetfilter_log_la_SOURCES = libnetfilter_log.c
+libnetfilter_log_la_LIBADD = ${LIBNFNETLINK_LIBS}
libnetfilter_log_libipulog_la_LDFLAGS = -Wc,-nostartfiles \
-version-info 1:0:0
--
1.7.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 09/11] build: set Libs.private for pkgconfig file
2010-10-30 22:09 libnetfilter_log: build system cleanups Jan Engelhardt
` (7 preceding siblings ...)
2010-10-30 22:09 ` [PATCH 08/11] build: no need for error message in PKG_CHECK_MODULES Jan Engelhardt
@ 2010-10-30 22:09 ` Jan Engelhardt
2010-10-30 22:09 ` [PATCH 10/11] Remove accidentally-added file "depcomp" Jan Engelhardt
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Jan Engelhardt @ 2010-10-30 22:09 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
Similar to the commit in iptables, add Libs.private to tell about
dependencies for static linking.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
libnetfilter_log.pc.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/libnetfilter_log.pc.in b/libnetfilter_log.pc.in
index 0a49c72..a4b2f3b 100644
--- a/libnetfilter_log.pc.in
+++ b/libnetfilter_log.pc.in
@@ -12,4 +12,5 @@ Version: @VERSION@
Requires: libnfnetlink
Conflicts:
Libs: -L${libdir} -lnetfilter_log
+Libs.private: @LIBNFNETLINK_LIBS@
Cflags: -I${includedir}
--
1.7.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 10/11] Remove accidentally-added file "depcomp"
2010-10-30 22:09 libnetfilter_log: build system cleanups Jan Engelhardt
` (8 preceding siblings ...)
2010-10-30 22:09 ` [PATCH 09/11] build: set Libs.private for pkgconfig file Jan Engelhardt
@ 2010-10-30 22:09 ` Jan Engelhardt
2010-10-30 22:09 ` [PATCH 11/11] Add .gitignore files Jan Engelhardt
2010-11-01 21:31 ` libnetfilter_log: build system cleanups Pablo Neira Ayuso
11 siblings, 0 replies; 13+ messages in thread
From: Jan Engelhardt @ 2010-10-30 22:09 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
depcomp | 479 ---------------------------------------------------------------
1 files changed, 0 insertions(+), 479 deletions(-)
delete mode 100755 depcomp
diff --git a/depcomp b/depcomp
deleted file mode 100755
index edb5d38..0000000
--- a/depcomp
+++ /dev/null
@@ -1,479 +0,0 @@
-#! /bin/sh
-
-# depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
- echo "depcomp: Variables source, object and depmode must be set" 1>&2
- exit 1
-fi
-# `libtool' can also be set to `yes' or `no'.
-
-if test -z "$depfile"; then
- base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
- dir=`echo "$object" | sed 's,/.*$,/,'`
- if test "$dir" = "$object"; then
- dir=
- fi
- # FIXME: should be _deps on DOS.
- depfile="$dir.deps/$base"
-fi
-
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags. We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write. Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
- # HP compiler uses -M and no extra arg.
- gccflag=-M
- depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
- # This is just like dashmstdout with a different argument.
- dashmflag=-xM
- depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want. Yay! Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff. Hmm.
- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- mv "$tmpdepfile" "$depfile"
- ;;
-
-gcc)
-## There are various ways to get dependency output from gcc. Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-## up in a subdir. Having to rename by hand is ugly.
-## (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-## -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-## than renaming).
- if test -z "$gccflag"; then
- gccflag=-MD,
- fi
- "$@" -Wp,"$gccflag$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
- sed -e 's/^[^:]*: / /' \
- -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header). We avoid this by adding
-## dummy dependencies for each header file. Too bad gcc doesn't do
-## this for us directly.
- tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'. On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-hp)
- # This case exists only to let depend.m4 do its work. It works by
- # looking at the text of this script. This case will never be run,
- # since it is checked for above.
- exit 1
- ;;
-
-sgi)
- if test "$libtool" = yes; then
- "$@" "-Wp,-MDupdate,$tmpdepfile"
- else
- "$@" -MDupdate "$tmpdepfile"
- fi
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
-
- if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
- echo "$object : \\" > "$depfile"
-
- # Clip off the initial element (the dependent). Don't try to be
- # clever and replace this with sed code, as IRIX sed won't handle
- # lines with more than a fixed number of characters (4096 in
- # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
- # the IRIX cc adds comments like `#:fec' to the end of the
- # dependency line.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
- tr '
-' ' ' >> $depfile
- echo >> $depfile
-
- # The second pass generates a dummy entry for each header file.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
- >> $depfile
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
-
-aix)
- # The C for AIX Compiler uses -M and outputs the dependencies
- # in a .u file. In older versions, this file always lives in the
- # current directory. Also, the AIX compiler puts `$object:' at the
- # start of each line; $object doesn't have directory information.
- # Version 6 uses the directory in both cases.
- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
- tmpdepfile="$stripped.u"
- if test "$libtool" = yes; then
- "$@" -Wc,-M
- else
- "$@" -M
- fi
- stat=$?
-
- if test -f "$tmpdepfile"; then :
- else
- stripped=`echo "$stripped" | sed 's,^.*/,,'`
- tmpdepfile="$stripped.u"
- fi
-
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
-
- if test -f "$tmpdepfile"; then
- outname="$stripped.o"
- # Each line is of the form `foo.o: dependent.h'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
-
-icc)
- # Intel's C compiler understands `-MD -MF file'. However on
- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
- # ICC 7.0 will fill foo.d with something like
- # foo.o: sub/foo.c
- # foo.o: sub/foo.h
- # which is wrong. We want:
- # sub/foo.o: sub/foo.c
- # sub/foo.o: sub/foo.h
- # sub/foo.c:
- # sub/foo.h:
- # ICC 7.1 will output
- # foo.o: sub/foo.c sub/foo.h
- # and will wrap long lines using \ :
- # foo.o: sub/foo.c ... \
- # sub/foo.h ... \
- # ...
-
- "$@" -MD -MF "$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
- # Each line is of the form `foo.o: dependent.h',
- # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
- sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
- # Some versions of the HPUX 10.20 sed can't process this invocation
- # correctly. Breaking it into two sed invocations is a workaround.
- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
- sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-tru64)
- # The Tru64 compiler uses -MD to generate dependencies as a side
- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
- # dependencies in `foo.d' instead, so we check for that too.
- # Subdirectories are respected.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
- if test "$libtool" = yes; then
- tmpdepfile1="$dir.libs/$base.lo.d"
- tmpdepfile2="$dir.libs/$base.d"
- "$@" -Wc,-MD
- else
- tmpdepfile1="$dir$base.o.d"
- tmpdepfile2="$dir$base.d"
- "$@" -MD
- fi
-
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile1" "$tmpdepfile2"
- exit $stat
- fi
-
- if test -f "$tmpdepfile1"; then
- tmpdepfile="$tmpdepfile1"
- else
- tmpdepfile="$tmpdepfile2"
- fi
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the [].
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
-
-#nosideeffect)
- # This comment above is used by automake to tell side-effect
- # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
- # Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout, regardless of -o.
- "$@" || exit $?
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
- while test $1 != '--mode=compile'; do
- shift
- done
- shift
- fi
-
- # Remove `-o $object'.
- IFS=" "
- for arg
- do
- case $arg in
- -o)
- shift
- ;;
- $object)
- shift
- ;;
- *)
- set fnord "$@" "$arg"
- shift # fnord
- shift # $arg
- ;;
- esac
- done
-
- test -z "$dashmflag" && dashmflag=-M
- # Require at least two characters before searching for `:'
- # in the target name. This is to cope with DOS-style filenames:
- # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
- "$@" $dashmflag |
- sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
- rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
- tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-dashXmstdout)
- # This case only exists to satisfy depend.m4. It is never actually
- # run, as this mode is specially recognized in the preamble.
- exit 1
- ;;
-
-makedepend)
- "$@" || exit $?
- # Remove any Libtool call
- if test "$libtool" = yes; then
- while test $1 != '--mode=compile'; do
- shift
- done
- shift
- fi
- # X makedepend
- shift
- cleared=no
- for arg in "$@"; do
- case $cleared in
- no)
- set ""; shift
- cleared=yes ;;
- esac
- case "$arg" in
- -D*|-I*)
- set fnord "$@" "$arg"; shift ;;
- # Strip any option that makedepend may not understand. Remove
- # the object too, otherwise makedepend will parse it as a source file.
- -*|$object)
- ;;
- *)
- set fnord "$@" "$arg"; shift ;;
- esac
- done
- obj_suffix="`echo $object | sed 's/^.*\././'`"
- touch "$tmpdepfile"
- ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
- rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
- sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile" "$tmpdepfile".bak
- ;;
-
-cpp)
- # Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout.
- "$@" || exit $?
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
- while test $1 != '--mode=compile'; do
- shift
- done
- shift
- fi
-
- # Remove `-o $object'.
- IFS=" "
- for arg
- do
- case $arg in
- -o)
- shift
- ;;
- $object)
- shift
- ;;
- *)
- set fnord "$@" "$arg"
- shift # fnord
- shift # $arg
- ;;
- esac
- done
-
- "$@" -E |
- sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
- sed '$ s: \\$::' > "$tmpdepfile"
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- cat < "$tmpdepfile" >> "$depfile"
- sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-msvisualcpp)
- # Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout, regardless of -o,
- # because we must use -o when running libtool.
- "$@" || exit $?
- IFS=" "
- for arg
- do
- case "$arg" in
- "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
- set fnord "$@"
- shift
- shift
- ;;
- *)
- set fnord "$@" "$arg"
- shift
- shift
- ;;
- esac
- done
- "$@" -E |
- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
- echo " " >> "$depfile"
- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-none)
- exec "$@"
- ;;
-
-*)
- echo "Unknown depmode $depmode" 1>&2
- exit 1
- ;;
-esac
-
-exit 0
--
1.7.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 11/11] Add .gitignore files
2010-10-30 22:09 libnetfilter_log: build system cleanups Jan Engelhardt
` (9 preceding siblings ...)
2010-10-30 22:09 ` [PATCH 10/11] Remove accidentally-added file "depcomp" Jan Engelhardt
@ 2010-10-30 22:09 ` Jan Engelhardt
2010-11-01 21:31 ` libnetfilter_log: build system cleanups Pablo Neira Ayuso
11 siblings, 0 replies; 13+ messages in thread
From: Jan Engelhardt @ 2010-10-30 22:09 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
---
.gitignore | 20 ++++++++++++++++++++
utils/.gitignore | 2 ++
2 files changed, 22 insertions(+), 0 deletions(-)
create mode 100644 .gitignore
create mode 100644 utils/.gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c9550f5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,20 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.o
+*.la
+*.lo
+
+/aclocal.m4
+/autom4te.cache
+/config.*
+/configure
+/depcomp
+/install-sh
+/libtool
+/ltmain.sh
+/missing
+
+/doxygen.cfg
+/*.pc
diff --git a/utils/.gitignore b/utils/.gitignore
new file mode 100644
index 0000000..64e4588
--- /dev/null
+++ b/utils/.gitignore
@@ -0,0 +1,2 @@
+/nfulnl_test
+/ulog_test
--
1.7.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: libnetfilter_log: build system cleanups
2010-10-30 22:09 libnetfilter_log: build system cleanups Jan Engelhardt
` (10 preceding siblings ...)
2010-10-30 22:09 ` [PATCH 11/11] Add .gitignore files Jan Engelhardt
@ 2010-11-01 21:31 ` Pablo Neira Ayuso
11 siblings, 0 replies; 13+ messages in thread
From: Pablo Neira Ayuso @ 2010-11-01 21:31 UTC (permalink / raw)
To: Jan Engelhardt; +Cc: netfilter-devel
On 31/10/10 00:09, Jan Engelhardt wrote:
> The following changes since commit 8d6a60cb89ebd330156e594456034e49a324a56e:
>
> license: upgrade to GPLv2+ (2010-10-29 20:35:43 +0200)
>
> are available in the git repository at:
> git://dev.medozas.de/libnetfilter_log master
pulled and pushed, thanks Jan.
^ permalink raw reply [flat|nested] 13+ messages in thread