diff options
author | /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org> | 2008-01-13 17:17:11 +0000 |
---|---|---|
committer | /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org> | 2008-01-13 17:17:11 +0000 |
commit | cdc8744396470397dcbb9b50dc197526c4cb834c (patch) | |
tree | afc721a43ce593dc8c2203d8f001629103bbea64 | |
parent | ae862addbf9456adad105df24b49e34921298de7 (diff) |
Several tree reorganizations:
- move l3extensions/ and extensions/ to src/deprecated/
- don't create submodules under /usr/lib/libnetfilter_conntrack/ anymore
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | extensions/Makefile.am | 25 | ||||
-rw-r--r-- | l3extensions/Makefile.am | 16 | ||||
-rw-r--r-- | src/Makefile.am | 11 | ||||
-rw-r--r-- | src/deprecated/extensions/Makefile.am | 14 | ||||
-rw-r--r-- | src/deprecated/extensions/libnetfilter_conntrack_icmp.c (renamed from extensions/libnetfilter_conntrack_icmp.c) | 0 | ||||
-rw-r--r-- | src/deprecated/extensions/libnetfilter_conntrack_sctp.c (renamed from extensions/libnetfilter_conntrack_sctp.c) | 0 | ||||
-rw-r--r-- | src/deprecated/extensions/libnetfilter_conntrack_tcp.c (renamed from extensions/libnetfilter_conntrack_tcp.c) | 0 | ||||
-rw-r--r-- | src/deprecated/extensions/libnetfilter_conntrack_udp.c (renamed from extensions/libnetfilter_conntrack_udp.c) | 0 | ||||
-rw-r--r-- | src/deprecated/l3extensions/Makefile.am | 9 | ||||
-rw-r--r-- | src/deprecated/l3extensions/libnetfilter_conntrack_ipv4.c (renamed from l3extensions/libnetfilter_conntrack_ipv4.c) | 0 | ||||
-rw-r--r-- | src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c (renamed from l3extensions/libnetfilter_conntrack_ipv6.c) | 0 |
13 files changed, 34 insertions, 45 deletions
diff --git a/Makefile.am b/Makefile.am index a5df5e1..262028c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Make_global.am AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 -SUBDIRS = include src l3extensions extensions utils +SUBDIRS = include src utils man_MANS = #nfnetlink_conntrack.3 nfnetlink_conntrack.7 diff --git a/configure.in b/configure.in index 12981db..bcaac42 100644 --- a/configure.in +++ b/configure.in @@ -70,5 +70,5 @@ LIBNFCONNTRACK_LIBS="$LIBNFNETLINK_LIBS" AC_SUBST(LIBNFCONNTRACK_LIBS) dnl Output the makefile -AC_OUTPUT(Makefile src/Makefile include/Makefile utils/Makefile include/libnetfilter_conntrack/Makefile l3extensions/Makefile extensions/Makefile src/conntrack/Makefile src/expect/Makefile libnetfilter_conntrack.pc) +AC_OUTPUT(Makefile src/Makefile include/Makefile utils/Makefile include/libnetfilter_conntrack/Makefile src/conntrack/Makefile src/expect/Makefile src/deprecated/Makefile src/deprecated/l3extensions/Makefile src/deprecated/extensions/Makefile libnetfilter_conntrack.pc) diff --git a/extensions/Makefile.am b/extensions/Makefile.am deleted file mode 100644 index 5251581..0000000 --- a/extensions/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -include $(top_srcdir)/Make_global.am - -AUTOMAKE_OPTIONS = no-dependencies foreign - -AM_CFLAGS=-fPIC -Wall -LIBS= - -pkglib_LTLIBRARIES = nfct_proto_tcp.la nfct_proto_udp.la \ - nfct_proto_icmp.la nfct_proto_sctp.la - -nfct_proto_tcp_la_SOURCES = libnetfilter_conntrack_tcp.c -nfct_proto_tcp_la_LDFLAGS = -module -avoid-version -release $(VERSION) -nfct_proto_tcp_la_LIBADD = ../src/libnetfilter_conntrack.la - -nfct_proto_udp_la_SOURCES = libnetfilter_conntrack_udp.c -nfct_proto_udp_la_LDFLAGS = -module -avoid-version -release $(VERSION) -nfct_proto_udp_la_LIBADD = ../src/libnetfilter_conntrack.la - -nfct_proto_icmp_la_SOURCES = libnetfilter_conntrack_icmp.c -nfct_proto_icmp_la_LDFLAGS = -module -avoid-version -release $(VERSION) -nfct_proto_icmp_la_LIBADD = ../src/libnetfilter_conntrack.la - -nfct_proto_sctp_la_SOURCES = libnetfilter_conntrack_sctp.c -nfct_proto_sctp_la_LDFLAGS = -module -avoid-version -release $(VERSION) -nfct_proto_sctp_la_LIBADD = ../src/libnetfilter_conntrack.la diff --git a/l3extensions/Makefile.am b/l3extensions/Makefile.am deleted file mode 100644 index fa21b2d..0000000 --- a/l3extensions/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -include $(top_srcdir)/Make_global.am - -AUTOMAKE_OPTIONS = no-dependencies foreign - -AM_CFLAGS=-fPIC -Wall -LIBS= - -pkglib_LTLIBRARIES = nfct_l3proto_ipv4.la nfct_l3proto_ipv6.la - -nfct_l3proto_ipv4_la_SOURCES = libnetfilter_conntrack_ipv4.c -nfct_l3proto_ipv4_la_LDFLAGS = -module -avoid-version -release $(VERSION) -nfct_l3proto_ipv4_la_LIBADD = ../src/libnetfilter_conntrack.la - -nfct_l3proto_ipv6_la_SOURCES = libnetfilter_conntrack_ipv6.c -nfct_l3proto_ipv6_la_LDFLAGS = -module -avoid-version -release $(VERSION) -nfct_l3proto_ipv6_la_LIBADD = ../src/libnetfilter_conntrack.la diff --git a/src/Makefile.am b/src/Makefile.am index d40277e..e7d1e38 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,7 @@ include $(top_srcdir)/Make_global.am #EXTRA_DIST = $(man_MANS) acinclude.m4 -SUBDIRS=conntrack expect +SUBDIRS=conntrack expect deprecated AM_CFLAGS = -fPIC -Wall LIBS = @LIBNFCONNTRACK_LIBS@ @@ -12,7 +12,14 @@ LIBS = @LIBNFCONNTRACK_LIBS@ lib_LTLIBRARIES = libnetfilter_conntrack.la libnetfilter_conntrack_la_LIBADD = conntrack/libnfconntrack.la \ - expect/libnfexpect.la + expect/libnfexpect.la \ + # deprecated extensions: scheduled to be removed + deprecated/l3extensions/libnfct_l3proto_ipv4.la \ + deprecated/l3extensions/libnfct_l3proto_ipv6.la \ + deprecated/extensions/libnfct_proto_tcp.la \ + deprecated/extensions/libnfct_proto_udp.la \ + deprecated/extensions/libnfct_proto_icmp.la \ + deprecated/extensions/libnfct_proto_sctp.la libnetfilter_conntrack_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink -ldl \ -version-info $(LIBVERSION) libnetfilter_conntrack_la_SOURCES = main.c deprecated.c diff --git a/src/deprecated/extensions/Makefile.am b/src/deprecated/extensions/Makefile.am new file mode 100644 index 0000000..e44525b --- /dev/null +++ b/src/deprecated/extensions/Makefile.am @@ -0,0 +1,14 @@ +include $(top_srcdir)/Make_global.am + +AUTOMAKE_OPTIONS = no-dependencies foreign + +AM_CFLAGS=-fPIC -Wall +LIBS= @LIBNFCONNTRACK_LIBS@ + +noinst_LTLIBRARIES = libnfct_proto_tcp.la libnfct_proto_udp.la \ + libnfct_proto_icmp.la libnfct_proto_sctp.la + +libnfct_proto_tcp_la_SOURCES = libnetfilter_conntrack_tcp.c +libnfct_proto_udp_la_SOURCES = libnetfilter_conntrack_udp.c +libnfct_proto_icmp_la_SOURCES = libnetfilter_conntrack_icmp.c +libnfct_proto_sctp_la_SOURCES = libnetfilter_conntrack_sctp.c diff --git a/extensions/libnetfilter_conntrack_icmp.c b/src/deprecated/extensions/libnetfilter_conntrack_icmp.c index 72a7eb0..72a7eb0 100644 --- a/extensions/libnetfilter_conntrack_icmp.c +++ b/src/deprecated/extensions/libnetfilter_conntrack_icmp.c diff --git a/extensions/libnetfilter_conntrack_sctp.c b/src/deprecated/extensions/libnetfilter_conntrack_sctp.c index 3785c2e..3785c2e 100644 --- a/extensions/libnetfilter_conntrack_sctp.c +++ b/src/deprecated/extensions/libnetfilter_conntrack_sctp.c diff --git a/extensions/libnetfilter_conntrack_tcp.c b/src/deprecated/extensions/libnetfilter_conntrack_tcp.c index 9efdbb7..9efdbb7 100644 --- a/extensions/libnetfilter_conntrack_tcp.c +++ b/src/deprecated/extensions/libnetfilter_conntrack_tcp.c diff --git a/extensions/libnetfilter_conntrack_udp.c b/src/deprecated/extensions/libnetfilter_conntrack_udp.c index c1d20c3..c1d20c3 100644 --- a/extensions/libnetfilter_conntrack_udp.c +++ b/src/deprecated/extensions/libnetfilter_conntrack_udp.c diff --git a/src/deprecated/l3extensions/Makefile.am b/src/deprecated/l3extensions/Makefile.am new file mode 100644 index 0000000..f8cb0a2 --- /dev/null +++ b/src/deprecated/l3extensions/Makefile.am @@ -0,0 +1,9 @@ +include $(top_srcdir)/Make_global.am + +AM_CFLAGS=-fPIC -Wall +LIBS = @LIBNFCONNTRACK_LIBS@ + +noinst_LTLIBRARIES = libnfct_l3proto_ipv4.la libnfct_l3proto_ipv6.la + +libnfct_l3proto_ipv4_la_SOURCES = libnetfilter_conntrack_ipv4.c +libnfct_l3proto_ipv6_la_SOURCES = libnetfilter_conntrack_ipv6.c diff --git a/l3extensions/libnetfilter_conntrack_ipv4.c b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv4.c index 727ea01..727ea01 100644 --- a/l3extensions/libnetfilter_conntrack_ipv4.c +++ b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv4.c diff --git a/l3extensions/libnetfilter_conntrack_ipv6.c b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c index b0c7a3f..b0c7a3f 100644 --- a/l3extensions/libnetfilter_conntrack_ipv6.c +++ b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c |