Attachment #692196 for bug #776982

View | Details | Raw Unified | Return to bug 776982
Collapse All | Expand All




  [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]

Lines 59-65 if ENABLE_PROFILE Link Here

(-)a/src/Makefile.am (-1 / +1 lines)
59	AM_LDFLAGS = -pg --coverage	59	AM_LDFLAGS = -pg --coverage
60	endif	60	endif
61		61
62	vde_autolink_LDADD = $(LDADD) lib/libvdemgmt.la	62	vde_autolink_LDADD = $(LDADD) lib/vdemgmt/libvdemgmt.la
63	vde_plug2tap_LDADD = $(LDADD) lib/libvdeplug.la	63	vde_plug2tap_LDADD = $(LDADD) lib/libvdeplug.la
64	if ENABLE_PCAP	64	if ENABLE_PCAP
65	vde_pcapplug_LDADD = $(LDADD) lib/libvdeplug.la -lpcap	65	vde_pcapplug_LDADD = $(LDADD) lib/libvdeplug.la -lpcap




AM_CPPFLAGS = -I$(top_srcdir)/include \
              -DSYSCONFDIR="\"$(sysconfdir)\"" -DLOCALSTATEDIR="\"$(localstatedir)\""
LIBADD = $(top_builddir)/src/common/libvdecommon.la
SUBDIRS = vdemgmt

if ENABLE_PROFILE
  AM_CFLAGS = -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

libvdesnmp_la_LIBADD = $(LIBADD) $(top_builddir)/src/lib/vdemgmt/libvdemgmt.la
libvdemgmt_la_LDFLAGS = $(AM_LDFLAGS) -version-number 0:0:1 -export-dynamic

libvdesnmp_la_LIBADD = $(LIBADD) $(top_builddir)/src/lib/libvdemgmt.la
libvdesnmp_la_LDFLAGS = $(AM_LDFLAGS) -version-number 0:0:1 -export-dynamic

libvdeplug_la_LIBADD = $(LIBADD)

endif

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = vdesnmp.pc vdeplug.pc vdehist.pc





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

Return to bug 776982

Lines 265-274 AC_CONFIG_FILES( Link Here

(-)a/configure.ac (-1 / +2 lines)
265	[src/Makefile]	265	[src/Makefile]
266	[src/lib/Makefile]	266	[src/lib/Makefile]
267	[src/lib/vdesnmp.pc]	267	[src/lib/vdesnmp.pc]
268	[src/lib/vdemgmt.pc]
269	[src/lib/vdeplug.pc]	268	[src/lib/vdeplug.pc]
270	[src/lib/vdehist.pc]	269	[src/lib/vdehist.pc]
271	[src/lib/python/Makefile]	270	[src/lib/python/Makefile]
		271	[src/lib/vdemgmt/Makefile]
		272	[src/lib/vdemgmt/vdemgmt.pc]
272	[src/vde_switch/Makefile]	273	[src/vde_switch/Makefile]
273	[src/kvde_switch/Makefile]	274	[src/kvde_switch/Makefile]
274	[src/vde_over_ns/Makefile]	275	[src/vde_over_ns/Makefile]

Lines 1-7 Link Here

(-)a/src/lib/Makefile.am (-8 / +3 lines)
1	AM_CPPFLAGS = -I$(top_srcdir)/include \	1	AM_CPPFLAGS = -I$(top_srcdir)/include \
2	-DSYSCONFDIR="\"$(sysconfdir)\"" -DLOCALSTATEDIR="\"$(localstatedir)\""	2	-DSYSCONFDIR="\"$(sysconfdir)\"" -DLOCALSTATEDIR="\"$(localstatedir)\""
3	LIBADD = $(top_builddir)/src/common/libvdecommon.la	3	LIBADD = $(top_builddir)/src/common/libvdecommon.la
4	SUBDIRS =	4	SUBDIRS = vdemgmt
5		5
6	if ENABLE_PROFILE	6	if ENABLE_PROFILE
7	AM_CFLAGS = -pg --coverage	7	AM_CFLAGS = -pg --coverage
Lines 9-25 if ENABLE_PROFILE Link Here
9	endif	9	endif
10		10
11	lib_LTLIBRARIES = \	11	lib_LTLIBRARIES = \
12	libvdemgmt.la \
13	libvdesnmp.la \	12	libvdesnmp.la \
14	libvdeplug.la \	13	libvdeplug.la \
15	libvdehist.la	14	libvdehist.la
16		15
17	# read before touching http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info	16	# read before touching http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
18		17
19	libvdemgmt_la_LIBADD = $(LIBADD)	18	libvdesnmp_la_LIBADD = $(LIBADD) $(top_builddir)/src/lib/vdemgmt/libvdemgmt.la
20	libvdemgmt_la_LDFLAGS = $(AM_LDFLAGS) -version-number 0:0:1 -export-dynamic
21
22	libvdesnmp_la_LIBADD = $(LIBADD) $(top_builddir)/src/lib/libvdemgmt.la
23	libvdesnmp_la_LDFLAGS = $(AM_LDFLAGS) -version-number 0:0:1 -export-dynamic	19	libvdesnmp_la_LDFLAGS = $(AM_LDFLAGS) -version-number 0:0:1 -export-dynamic
24		20
25	libvdeplug_la_LIBADD = $(LIBADD)	21	libvdeplug_la_LIBADD = $(LIBADD)
Lines 33-37 SUBDIRS += . python Link Here
33	endif	29	endif
34		30
35	pkgconfigdir = $(libdir)/pkgconfig	31	pkgconfigdir = $(libdir)/pkgconfig
36	pkgconfig_DATA = vdesnmp.pc vdemgmt.pc vdeplug.pc vdehist.pc	32	pkgconfig_DATA = vdesnmp.pc vdeplug.pc vdehist.pc
37

Line 0 Link Here

(-)a/src/lib/vdemgmt/Makefile.am (+18 lines)
	1	AM_CPPFLAGS = -I$(top_srcdir)/include \
	2	-DSYSCONFDIR="\"$(sysconfdir)\"" -DLOCALSTATEDIR="\"$(localstatedir)\""
	3	LIBADD = $(top_builddir)/src/common/libvdecommon.la
	4
	5	if ENABLE_PROFILE
	6	AM_CFLAGS = -pg --coverage
	7	AM_LDFLAGS = -pg --coverage
	8	endif
	9
	10	lib_LTLIBRARIES = libvdemgmt.la
	11
	12	# read before touching http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
	13
	14	libvdemgmt_la_LIBADD = $(LIBADD)
	15	libvdemgmt_la_LDFLAGS = $(AM_LDFLAGS) -version-number 0:0:1 -export-dynamic
	16
	17	pkgconfigdir = $(libdir)/pkgconfig
	18	pkgconfig_DATA = vdemgmt.pc