build: move ipset_errcode into library

The library cannot stand on its own:

19:13 seven:../ipset/lib > ldd -r .libs/libipset.so.1
        linux-vdso.so.1 =>  (0x00007fff9a569000)
        libmnl.so.0 => /usr/lib64/libmnl.so.0 (0x00007fd42ae5c000)
        libc.so.6 => /lib64/libc.so.6 (0x00007fd42aaef000)
        /lib64/ld-linux-x86-64.so.2 (0x00007fd42b28d000)
undefined symbol: ipset_errcode (.libs/libipset.so.1)

Resolve this by moving ipset_errcode into the library.

Reported-by: Arkadiusz Miskiewicz <a.miskiewicz@gmail.com>
References: http://marc.info/?l=netfilter-devel&m=131435791514602&w=2

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7913877de6003e9f3c6b11bc7ab7b3374bc019d1..8afe611f2be9547d9403a9fd1353baa838e67672 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -8,6 +8,7 @@ libipset_la_LDFLAGS = -version-info $(LIBVERSION)
 libipset_la_LIBADD  = ${libmnl_LIBS}
 libipset_la_SOURCES = \
        data.c \
+       errcode.c \
        icmp.c \
        icmpv6.c \
        mnl.c \

diff --git a/src/errcode.c b/lib/errcode.c
similarity index 100%
rename from src/errcode.c
rename to lib/errcode.c

diff --git a/src/Makefile.am b/src/Makefile.am
index f3047f083a6972170b877ca137105869dea0b08f..8ba441da33690a36d9b98eed48438bc342d943dd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,6 @@ include $(top_srcdir)/Make_global.am
 
 sbin_PROGRAMS  = ipset
 ipset_SOURCES  = ipset.c \
-       errcode.c \
        ipset_bitmap_ip.c \
        ipset_bitmap_ipmac.c \
        ipset_bitmap_port.c \