Merge pull request virtualsquare#25 from orbea/parallel

build: Fix parallel make.

configure.ac

@@ -265,10 +265,11 @@ AC_CONFIG_FILES(
   [src/Makefile]
   [src/lib/Makefile]
   [src/lib/vdesnmp.pc]
-  [src/lib/vdemgmt.pc]
   [src/lib/vdeplug.pc]
   [src/lib/vdehist.pc]
   [src/lib/python/Makefile]
+  [src/lib/vdemgmt/Makefile]
+  [src/lib/vdemgmt/vdemgmt.pc]
   [src/vde_switch/Makefile]
   [src/kvde_switch/Makefile]
   [src/vde_over_ns/Makefile]

src/Makefile.am

@@ -59,7 +59,7 @@ if ENABLE_PROFILE
   AM_LDFLAGS = -pg --coverage
 endif
 
-vde_autolink_LDADD = $(LDADD) lib/libvdemgmt.la
+vde_autolink_LDADD = $(LDADD) lib/vdemgmt/libvdemgmt.la
 vde_plug2tap_LDADD = $(LDADD) lib/libvdeplug.la
 if ENABLE_PCAP
   vde_pcapplug_LDADD = $(LDADD) lib/libvdeplug.la -lpcap

src/lib/Makefile.am

@@ -1,25 +1,21 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include \
               -DSYSCONFDIR="\"$(sysconfdir)\"" -DLOCALSTATEDIR="\"$(localstatedir)\""
 LIBADD = $(top_builddir)/src/common/libvdecommon.la
-SUBDIRS =
+SUBDIRS = vdemgmt
 
 if ENABLE_PROFILE
   AM_CFLAGS = -pg --coverage
   AM_LDFLAGS = -pg --coverage
 endif
 
 lib_LTLIBRARIES = \
-	libvdemgmt.la \
 	libvdesnmp.la \
 	libvdeplug.la \
 	libvdehist.la
 
 # read before touching http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
 
-libvdemgmt_la_LIBADD = $(LIBADD)
-libvdemgmt_la_LDFLAGS = $(AM_LDFLAGS) -version-number 0:0:1 -export-dynamic
-
-libvdesnmp_la_LIBADD = $(LIBADD) $(top_builddir)/src/lib/libvdemgmt.la
+libvdesnmp_la_LIBADD = $(LIBADD) $(top_builddir)/src/lib/vdemgmt/libvdemgmt.la
 libvdesnmp_la_LDFLAGS = $(AM_LDFLAGS) -version-number 0:0:1 -export-dynamic
 
 libvdeplug_la_LIBADD = $(LIBADD)
@@ -33,5 +29,4 @@ SUBDIRS += . python
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = vdesnmp.pc vdemgmt.pc vdeplug.pc vdehist.pc
-
+pkgconfig_DATA = vdesnmp.pc vdeplug.pc vdehist.pc

src/lib/vdemgmt/Makefile.am

@@ -0,0 +1,18 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include \
+              -DSYSCONFDIR="\"$(sysconfdir)\"" -DLOCALSTATEDIR="\"$(localstatedir)\""
+LIBADD = $(top_builddir)/src/common/libvdecommon.la
+
+if ENABLE_PROFILE
+  AM_CFLAGS = -pg --coverage
+  AM_LDFLAGS = -pg --coverage
+endif
+
+lib_LTLIBRARIES = libvdemgmt.la
+
+# read before touching http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
+
+libvdemgmt_la_LIBADD = $(LIBADD)
+libvdemgmt_la_LDFLAGS = $(AM_LDFLAGS) -version-number 0:0:1 -export-dynamic
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = vdemgmt.pc