From ae862addbf9456adad105df24b49e34921298de7 Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org" Date: Sun, 13 Jan 2008 16:47:47 +0000 Subject: several cleanups for Makefile.am --- src/Makefile.am | 4 ++-- src/conntrack/Makefile.am | 20 ++++++++------------ src/expect/Makefile.am | 16 ++++++---------- 3 files changed, 16 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 4cb3e28..d40277e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,8 +11,8 @@ LIBS = @LIBNFCONNTRACK_LIBS@ lib_LTLIBRARIES = libnetfilter_conntrack.la -libnetfilter_conntrack_la_LIBADD = conntrack/libnetfilter_conntrack_new_api.la \ - expect/libnetfilter_conntrack_expect.la +libnetfilter_conntrack_la_LIBADD = conntrack/libnfconntrack.la \ + expect/libnfexpect.la libnetfilter_conntrack_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink -ldl \ -version-info $(LIBVERSION) libnetfilter_conntrack_la_SOURCES = main.c deprecated.c diff --git a/src/conntrack/Makefile.am b/src/conntrack/Makefile.am index 3a138e4..e37c3eb 100644 --- a/src/conntrack/Makefile.am +++ b/src/conntrack/Makefile.am @@ -1,18 +1,14 @@ include $(top_srcdir)/Make_global.am -#AUTOMAKE_OPTIONS = no-dependencies foreign - -#EXTRA_DIST = $(man_MANS) acinclude.m4 - AM_CFLAGS = -fPIC -Wall LIBS = @LIBNFCONNTRACK_LIBS@ -noinst_LTLIBRARIES = libnetfilter_conntrack_new_api.la +noinst_LTLIBRARIES = libnfconntrack.la -libnetfilter_conntrack_new_api_la_SOURCES = api.c callback.c \ - getter.c setter.c \ - parse.c build.c \ - snprintf.c \ - snprintf_default.c snprintf_xml.c \ - objopt.c \ - compare.c +libnfconntrack_la_SOURCES = api.c callback.c \ + getter.c setter.c \ + parse.c build.c \ + snprintf.c \ + snprintf_default.c snprintf_xml.c \ + objopt.c \ + compare.c diff --git a/src/expect/Makefile.am b/src/expect/Makefile.am index 80bef3c..b54e564 100644 --- a/src/expect/Makefile.am +++ b/src/expect/Makefile.am @@ -1,16 +1,12 @@ include $(top_srcdir)/Make_global.am -#AUTOMAKE_OPTIONS = no-dependencies foreign - -#EXTRA_DIST = $(man_MANS) acinclude.m4 - AM_CFLAGS = -fPIC -Wall LIBS = @LIBNFCONNTRACK_LIBS@ -noinst_LTLIBRARIES = libnetfilter_conntrack_expect.la +noinst_LTLIBRARIES = libnfexpect.la -libnetfilter_conntrack_expect_la_SOURCES = api.c callback.c \ - getter.c setter.c \ - parse.c build.c \ - snprintf.c \ - snprintf_default.c +libnfexpect_la_SOURCES = api.c callback.c \ + getter.c setter.c \ + parse.c build.c \ + snprintf.c \ + snprintf_default.c -- cgit v1.2.3