diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2010-11-07 20:53:15 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2010-11-07 20:53:15 +0100 |
| commit | 415a51b34293eac33a7d2152b909f89e5af4ed10 (patch) | |
| tree | ca67a4343ab2851a42667c5e9768b73677b6b77c | |
| parent | ea4b5f90662c63d6ceccc7c9c851dd183e65d0e6 (diff) | |
| parent | f49123a2504244267d866ac72ca574dcca22a1a9 (diff) | |
| download | libmnl-415a51b34293eac33a7d2152b909f89e5af4ed10.tar.gz libmnl-415a51b34293eac33a7d2152b909f89e5af4ed10.zip | |
Merge branch 'master' of git://dev.medozas.de/libmnl
| -rw-r--r-- | Make_global.am | 2 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/Make_global.am b/Make_global.am index 78a0e35..4aff85c 100644 --- a/Make_global.am +++ b/Make_global.am @@ -21,4 +21,4 @@ LIBVERSION=0:0:0 CPPFLAGS = -I$(top_srcdir)/include -AM_CFLAGS=-fPIC -Wall -Wextra -Wno-unused-parameter +AM_CFLAGS = -Wall -Wextra -Wno-unused-parameter diff --git a/Makefile.am b/Makefile.am index 6d5b8dd..dec85d0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,3 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libmnl.pc ${pkgconfig_DATA}: ${top_builddir}/config.status - -$(OBJECTS): libtool -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck diff --git a/configure.ac b/configure.ac index ea1aa4b..9281156 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,6 @@ AM_PROG_CC_C_O AC_EXEEXT AC_DISABLE_STATIC LT_INIT -AC_SUBST(LIBTOOL_DEPS) case $target in *-*-linux*) ;; |