From b9b7caa43c98108009db29acfe2d1874eb426670 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 30 Oct 2010 23:05:38 +0200 Subject: build: avoid use of deprecated INCLUDES Makefile.am: "INCLUDES" is the old name for "AM_CPPFLAGS" (or "*_CPPFLAGS") And remove unused $(all_includes) Signed-off-by: Jan Engelhardt --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 63d5bc8..c408961 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,7 @@ # LIBVERSION=2:0:1 -INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR} +AM_CPPFLAGS = -I$(top_srcdir)/include -I${KERNELDIR} AM_CFLAGS = -fPIC -Wall LIBS = @LIBNFQUEUE_LIBS@ -- cgit v1.2.3 From 76bc07182b724bf177197799ea5ade112aed931b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 30 Oct 2010 23:09:45 +0200 Subject: build: no need for error message in PKG_CHECK_MODULES PKG_CHECK_MODULES already produces its own (and more verbose) messsage when a module cannot be found. Mucking around with CFLAGS and LIBS is also not needed since pkgconfig takes care of providing variables, so let's use them in Makefile.am. Signed-off-by: Jan Engelhardt --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index c408961..aa1f5ba 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,11 +21,11 @@ LIBVERSION=2:0:1 AM_CPPFLAGS = -I$(top_srcdir)/include -I${KERNELDIR} -AM_CFLAGS = -fPIC -Wall -LIBS = @LIBNFQUEUE_LIBS@ +AM_CFLAGS = -fPIC -Wall ${LIBNFNETLINK_CFLAGS} lib_LTLIBRARIES = libnetfilter_queue.la libnetfilter_queue_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink \ -version-info $(LIBVERSION) libnetfilter_queue_la_SOURCES = libnetfilter_queue.c +libnetfilter_queue_la_LIBADD = ${LIBNFNETLINK_LIBS} -- cgit v1.2.3 From 4558271002c2190d4ee559f6b7a5f499a23ae6a8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 30 Oct 2010 23:54:44 +0200 Subject: build: remove -fPIC flag libtool automatically adds PIC flags as needed. Signed-off-by: Jan Engelhardt --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index aa1f5ba..a745129 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,7 +21,7 @@ LIBVERSION=2:0:1 AM_CPPFLAGS = -I$(top_srcdir)/include -I${KERNELDIR} -AM_CFLAGS = -fPIC -Wall ${LIBNFNETLINK_CFLAGS} +AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS} lib_LTLIBRARIES = libnetfilter_queue.la -- cgit v1.2.3