summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
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 16:47:47 +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 16:47:47 +0000
commitae862addbf9456adad105df24b49e34921298de7 (patch)
treeb5cee77a07c313120f199f9f30a0567899e64f7a /src
parentd94805d59bbd3a4ceb725f5fc4c6e6778dc25709 (diff)
several cleanups for Makefile.am
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am4
-rw-r--r--src/conntrack/Makefile.am20
-rw-r--r--src/expect/Makefile.am16
3 files changed, 16 insertions, 24 deletions
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