summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2017-02-26 21:25:28 +0100
committerThomas Haller <thaller@redhat.com>2017-02-27 13:36:03 +0100
commit061d4fd8b8b4925a6cb689e7411a5b802faa2876 (patch)
treec0c2d4b1f3f4c88f2cd89bd3a1dcb0b618accd5f /src
parent7b375953fa01c5f328b1b566d29f6c2c78d6609b (diff)
downloadlibnl-061d4fd8b8b4925a6cb689e7411a5b802faa2876.tar.gz
build: merge src/lib/Makefile.am into top-level makefile
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/lib/Makefile.am59
2 files changed, 0 insertions, 61 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index a77b3288..bf702176 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,5 @@
# -*- Makefile -*-
-SUBDIRS = lib
-
AM_CPPFLAGS = \
-I${top_srcdir}/include/linux-private \
-I${top_srcdir}/include \
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
deleted file mode 100644
index 77076509..00000000
--- a/src/lib/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- Makefile -*-
-
-AM_CPPFLAGS = \
- -I${top_srcdir}/include/linux-private \
- -I${top_srcdir}/include \
- -I${top_builddir}/include \
- -D_GNU_SOURCE \
- -DPKGLIBDIR=\"$(pkglibdir)\" \
- -DSYSCONFDIR=\"$(sysconfdir)\"
-
-AM_CFLAGS = -Wall
-AM_LDFLAGS = \
- -rdynamic \
- -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
-#cls_ematch_cmp_la_LDFLAGS = -module -version-info 2:0:0
-
-#cls/ematch_grammar.c: cls/ematch_grammar.l
-# $(LEX) --header-file=cls/ematch_grammar.h $(LFLAGS) -o $@ $^
-
-#cls/ematch_syntax.c: cls/ematch_syntax.y
-# $(YACC) -d $(YFLAGS) -o $@ $^
-
-#cls/pktloc_grammar.c: cls/pktloc_grammar.l
-# $(LEX) --header-file=cls/pktloc_grammar.h $(LFLAGS) -o $@ $^
-
-#cls/pktloc_syntax.c: cls/pktloc_syntax.y
-# $(YACC) -d $(YFLAGS) -o $@ $^
-
-#CLEANFILES = \
-# cls/ematch_grammar.c cls/ematch_grammar.h \
-# cls/ematch_syntax.c cls/ematch_syntax.h \
-# cls/pktloc_grammar.c cls/pktloc_grammar.h \
-# cls/pktloc_syntax.c cls/pktloc_syntax.h
-
-lib_LTLIBRARIES = \
- libnl-cli-3.la
-
-libnl_cli_3_la_LDFLAGS = \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -Wl,--version-script=$(top_srcdir)/libnl-cli-3.sym
-libnl_cli_3_la_DEPENDENCIES = \
- $(top_srcdir)/libnl-cli-3.sym
-
-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 ${NL_LIBADD}
-
-libnl_cli_3_la_SOURCES = \
- utils.c addr.c ct.c link.c neigh.c rule.c route.c \
- tc.c qdisc.c class.c cls.c exp.c
-# cls/ematch_syntax.c cls/ematch_grammar.c cls/ematch.c
-# cls/pktloc_syntax.c cls/pktloc_grammar.c cls/utils.c