4 files changed, 51 insertions, 67 deletions
diff --git a/Makefile.am b/Makefile.am
index 1b5c4e78..42c1f513 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -492,12 +492,10 @@ lib_libnl_xfrm_3_la_LIBADD = \
 
 if ENABLE_CLI
 
-lib_cli_ldflags = \
-	-module -avoid-version
-
-nobase_pkglib_LTLIBRARIES = \
+lib_cli_ltlibraries_cls = \
 	lib/cli/cls/basic.la \
-	lib/cli/cls/cgroup.la \
+	lib/cli/cls/cgroup.la
+lib_cli_ltlibraries_qdisc = \
 	lib/cli/qdisc/bfifo.la \
 	lib/cli/qdisc/blackhole.la \
 	lib/cli/qdisc/fq_codel.la \
@@ -507,6 +505,16 @@ nobase_pkglib_LTLIBRARIES = \
 	lib/cli/qdisc/pfifo.la \
 	lib/cli/qdisc/plug.la
 
+pkglib_clsdir = $(pkglibdir)/cli/cls
+pkglib_qdiscdir = $(pkglibdir)/cli/qdisc
+pkglib_cls_LTLIBRARIES = $(lib_cli_ltlibraries_cls)
+pkglib_qdisc_LTLIBRARIES = $(lib_cli_ltlibraries_qdisc)
+
+endif
+
+lib_cli_ldflags = \
+	-module -avoid-version
+
 lib_cli_cls_basic_la_CPPFLAGS       = $(lib_cppflags)
 lib_cli_cls_basic_la_LDFLAGS        = $(lib_cli_ldflags)
 lib_cli_cls_cgroup_la_CPPFLAGS      = $(lib_cppflags)
@@ -527,8 +535,46 @@ lib_cli_qdisc_pfifo_la_CPPFLAGS     = $(lib_cppflags)
 lib_cli_qdisc_pfifo_la_LDFLAGS      = $(lib_cli_ldflags)
 lib_cli_qdisc_plug_la_CPPFLAGS      = $(lib_cppflags)
 lib_cli_qdisc_plug_la_LDFLAGS       = $(lib_cli_ldflags)
+
+###############################################################################
+
+if ENABLE_CLI
+lib_LTLIBRARIES += src/lib/libnl-cli-3.la
 endif
 
+src_lib_libnl_cli_3_la_SOURCES = \
+	src/lib/utils.c \
+	src/lib/addr.c \
+	src/lib/ct.c \
+	src/lib/link.c \
+	src/lib/neigh.c \
+	src/lib/rule.c \
+	src/lib/route.c \
+	src/lib/tc.c \
+	src/lib/qdisc.c \
+	src/lib/class.c \
+	src/lib/cls.c \
+	src/lib/exp.c
+EXTRA_src_lib_libnl_cli_3_la_DEPENDENCIES = \
+	libnl-cli-3.sym
+src_lib_libnl_cli_3_la_CPPFLAGS = \
+	-Wall \
+	-D_GNU_SOURCE \
+	-DPKGLIBDIR=\"$(pkglibdir)\" \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-I$(srcdir)/include/linux-private \
+	-I$(srcdir)/include \
+	-I$(builddir)/include
+src_lib_libnl_cli_3_la_LDFLAGS = \
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+	-Wl,--version-script=$(srcdir)/libnl-cli-3.sym
+src_lib_libnl_cli_3_la_LIBADD = \
+	lib/libnl-3.la \
+	lib/libnl-route-3.la \
+	lib/libnl-nf-3.la \
+	lib/libnl-genl-3.la \
+	-ldl
+
 ###############################################################################
 
 tests_cppflags = \
diff --git a/configure.ac b/configure.ac
index 809da6af..f3386dec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,7 +135,6 @@ libnl-cli-3.0.pc
 libnl-xfrm-3.0.pc
 libnl-idiag-3.0.pc
 src/Makefile
-src/lib/Makefile
 python/setup.py
 include/netlink/version.h
 ])
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