diff options
| author | Jan Engelhardt <jengelh@inai.de> | 2013-11-26 15:19:45 +0100 |
|---|---|---|
| committer | Thomas Graf <tgraf@suug.ch> | 2013-11-27 23:38:50 +0100 |
| commit | bda0f668b6355e84b1db89d934e8e5062a2ef0bb (patch) | |
| tree | 304a85abba2398a23bf5e191e1a4f29a12d2a5ba /src | |
| parent | ae19ac01545ee2429f2fcbb37b36f8471a5d1498 (diff) | |
| download | libnl-bda0f668b6355e84b1db89d934e8e5062a2ef0bb.tar.gz | |
build: separate compiler and linker flags
-Wall is a compiler flag, and thus should be in CFLAGS,
not CPPFLAGS. Similarly, -l belongs into LDADD/LIBADD because of
ordering constraints.
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/lib/Makefile.am | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 87dd8712..b2b7fc7f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,8 @@ SUBDIRS = lib -AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl\" +AM_CPPFLAGS = -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl\" +AM_CFLAGS = -Wall LDADD = \ ${top_builddir}/src/lib/libnl-cli-3.la \ diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 6688e7c0..51611151 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -1,10 +1,12 @@ # -*- Makefile -*- -AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -DPKGLIBDIR=\"$(pkglibdir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -rdynamic +AM_CPPFLAGS = -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -DPKGLIBDIR=\"$(pkglibdir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -rdynamic +AM_CFLAGS = -Wall AM_LDFLAGS = \ - -L${top_builddir}/lib \ - -ldl \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) +NL_LIBADD = \ + -L${top_builddir}/lib \ + -ldl #nobase_pkglib_LTLIBRARIES = cls/basic.la cls/ematch/cmp.la #cls_basic_la_LDFLAGS = -module -version-info 2:0:0 @@ -34,7 +36,7 @@ lib_LTLIBRARIES = \ libnl_cli_3_la_LIBADD = ${top_builddir}/lib/libnl-3.la \ ${top_builddir}/lib/libnl-route-3.la \ ${top_builddir}/lib/libnl-nf-3.la \ - ${top_builddir}/lib/libnl-genl-3.la + ${top_builddir}/lib/libnl-genl-3.la ${NL_LIBADD} libnl_cli_3_la_SOURCES = \ utils.c addr.c ct.c link.c neigh.c rule.c route.c \ |