From dca6847a476bfd14fc983b46f016efa82a229d89 Mon Sep 17 00:00:00 2001 From: fgiunchedi Date: Sat, 17 Oct 2009 21:29:00 +0000 Subject: [PATCH] now make distcheck is successful git-svn-id: https://vde.svn.sourceforge.net/svnroot/vde/trunk@401 d37a7db1-d92d-0410-89df-f68f52f87b57 --- vde-2/man/Makefile.am | 3 ++- vde-2/src/Makefile.am | 2 +- vde-2/src/kvde_switch/Makefile.am | 4 +++- vde-2/src/lib/Makefile.am | 2 +- vde-2/src/slirpvde/Makefile.am | 2 +- vde-2/src/vde_cryptcab/Makefile.am | 2 +- vde-2/src/vde_l3/Makefile.am | 8 ++++---- vde-2/src/vde_over_ns/Makefile.am | 2 +- vde-2/src/vde_switch/Makefile.am | 2 +- vde-2/src/vde_switch/plugins/Makefile.am | 4 ++-- vde-2/src/vdetaplib/Makefile.am | 4 ++-- 11 files changed, 19 insertions(+), 16 deletions(-) diff --git a/vde-2/man/Makefile.am b/vde-2/man/Makefile.am index 3f7fc17..490a159 100644 --- a/vde-2/man/Makefile.am +++ b/vde-2/man/Makefile.am @@ -11,7 +11,8 @@ CLEANFILES = $(generated_mans) EXTRA_DIST = $(static_mans) vdetaplib.1.in vde_pcapplug.1 vdetaplib.1: vdetaplib.1.in - sed 's/%PKGLIBDIR%/$(subst /,\/,$(pkglibdir))/g' vdetaplib.1.in > vdetaplib.1 + sed 's/%PKGLIBDIR%/$(subst /,\/,$(pkglibdir))/g' \ + $(srcdir)/vdetaplib.1.in > $(builddir)/vdetaplib.1 install-data-hook: rm -f $(DESTDIR)$(mandir)/man1/vdeqemu.1 diff --git a/vde-2/src/Makefile.am b/vde-2/src/Makefile.am index 7831254..0c02021 100644 --- a/vde-2/src/Makefile.am +++ b/vde-2/src/Makefile.am @@ -17,7 +17,7 @@ bin_PROGRAMS = \ wirefilter \ vdeterm -DIST_SUBDIRS = $(SUBDIRS) vdetaplib vde_cryptcab kvde_switch +#DIST_SUBDIRS = $(SUBDIRS) vdetaplib vde_cryptcab kvde_switch if CAN_MAKE_VDETUNCTL sbin_PROGRAMS = vde_tunctl diff --git a/vde-2/src/kvde_switch/Makefile.am b/vde-2/src/kvde_switch/Makefile.am index d298113..b0e1b16 100644 --- a/vde-2/src/kvde_switch/Makefile.am +++ b/vde-2/src/kvde_switch/Makefile.am @@ -5,6 +5,8 @@ if ENABLE_PROFILE AM_LDFLAGS = -pg --coverage endif +noinst_HEADERS = af_ipn.h + bin_PROGRAMS = kvde_switch kvde_switch_SOURCES = consmgmt.c \ consmgmt.h \ @@ -13,4 +15,4 @@ kvde_switch_SOURCES = consmgmt.c \ kvde_switch.c \ sockutils.c \ sockutils.h -kvde_switch_LDADD = $(top_srcdir)/src/common/libvdecommon.la +kvde_switch_LDADD = $(top_builddir)/src/common/libvdecommon.la diff --git a/vde-2/src/lib/Makefile.am b/vde-2/src/lib/Makefile.am index a1a47e9..d258829 100644 --- a/vde-2/src/lib/Makefile.am +++ b/vde-2/src/lib/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/include \ -DSYSCONFDIR="\"$(sysconfdir)\"" -DLOCALSTATEDIR="\"$(localstatedir)\"" -LIBADD = $(top_srcdir)/src/common/libvdecommon.la +LIBADD = $(top_builddir)/src/common/libvdecommon.la if ENABLE_PROFILE AM_CFLAGS = -pg --coverage diff --git a/vde-2/src/slirpvde/Makefile.am b/vde-2/src/slirpvde/Makefile.am index 85cd70f..dfd7b10 100644 --- a/vde-2/src/slirpvde/Makefile.am +++ b/vde-2/src/slirpvde/Makefile.am @@ -50,4 +50,4 @@ slirpvde_SOURCES = \ tcp2unix.h \ slirpvde.c -slirpvde_LDADD = $(top_srcdir)/src/common/libvdecommon.la $(top_srcdir)/src/lib/libvdeplug.la +slirpvde_LDADD = $(top_builddir)/src/common/libvdecommon.la $(top_builddir)/src/lib/libvdeplug.la diff --git a/vde-2/src/vde_cryptcab/Makefile.am b/vde-2/src/vde_cryptcab/Makefile.am index 60da8db..a589600 100644 --- a/vde-2/src/vde_cryptcab/Makefile.am +++ b/vde-2/src/vde_cryptcab/Makefile.am @@ -11,4 +11,4 @@ if ENABLE_PROFILE endif vde_cryptcab_SOURCES = crc32.c crc32.h cryptcab.h cryptcab.c vde_cryptcab_server.c vde_cryptcab_client.c -vde_cryptcab_LDADD = $(top_srcdir)/src/common/libvdecommon.la -lcrypto $(top_srcdir)/src/lib/libvdeplug.la +vde_cryptcab_LDADD = $(top_builddir)/src/common/libvdecommon.la -lcrypto $(top_builddir)/src/lib/libvdeplug.la diff --git a/vde-2/src/vde_l3/Makefile.am b/vde-2/src/vde_l3/Makefile.am index 1a6f32d..748cb78 100644 --- a/vde-2/src/vde_l3/Makefile.am +++ b/vde-2/src/vde_l3/Makefile.am @@ -15,10 +15,10 @@ pfifo_la_SOURCES = pfifo.c vde_buff.h tbf_la_SOURCES = tbf.c vde_buff.h bfifo_la_SOURCES = bfifo.c vde_buff.h -pfifo_la_LIBADD = $(top_srcdir)/src/common/libvdecommon.la -bfifo_la_LIBADD = $(top_srcdir)/src/common/libvdecommon.la -tbf_la_LIBADD = $(top_srcdir)/src/common/libvdecommon.la +pfifo_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la +bfifo_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la +tbf_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la bin_PROGRAMS = vde_l3 vde_l3_SOURCES = vde_l3.c vde_buff.h vde_l3.h -vde_l3_LDADD = $(top_srcdir)/src/common/libvdecommon.la $(top_srcdir)/src/lib/libvdeplug.la +vde_l3_LDADD = $(top_builddir)/src/common/libvdecommon.la $(top_builddir)/src/lib/libvdeplug.la diff --git a/vde-2/src/vde_over_ns/Makefile.am b/vde-2/src/vde_over_ns/Makefile.am index e4dfe17..6506e40 100644 --- a/vde-2/src/vde_over_ns/Makefile.am +++ b/vde-2/src/vde_over_ns/Makefile.am @@ -19,4 +19,4 @@ vde_over_ns_SOURCES = \ fun.h \ pstack.h -vde_over_ns_LDADD = $(top_srcdir)/src/common/libvdecommon.la $(top_srcdir)/src/lib/libvdeplug.la +vde_over_ns_LDADD = $(top_builddir)/src/common/libvdecommon.la $(top_builddir)/src/lib/libvdeplug.la diff --git a/vde-2/src/vde_switch/Makefile.am b/vde-2/src/vde_switch/Makefile.am index 3f9ad21..dd399ba 100644 --- a/vde-2/src/vde_switch/Makefile.am +++ b/vde-2/src/vde_switch/Makefile.am @@ -22,7 +22,7 @@ vde_switch_SOURCES = \ tuntap.c \ tuntap.h -vde_switch_LDADD = $(top_srcdir)/src/common/libvdecommon.la +vde_switch_LDADD = $(top_builddir)/src/common/libvdecommon.la AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = -Wall diff --git a/vde-2/src/vde_switch/plugins/Makefile.am b/vde-2/src/vde_switch/plugins/Makefile.am index c3ff33c..5842ff0 100644 --- a/vde-2/src/vde_switch/plugins/Makefile.am +++ b/vde-2/src/vde_switch/plugins/Makefile.am @@ -16,12 +16,12 @@ endif mod_LTLIBRARIES = dump.la dump_la_SOURCES = dump.c -dump_la_LIBADD = $(top_srcdir)/src/common/libvdecommon.la +dump_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la if ENABLE_PCAP mod_LTLIBRARIES += pdump.la pdump_la_SOURCES = pdump.c - pdump_la_LIBADD = $(top_srcdir)/src/common/libvdecommon.la -lpcap + pdump_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la -lpcap else EXTRA_DIST = pdump.c endif diff --git a/vde-2/src/vdetaplib/Makefile.am b/vde-2/src/vdetaplib/Makefile.am index e3fb168..dff66d3 100644 --- a/vde-2/src/vdetaplib/Makefile.am +++ b/vde-2/src/vdetaplib/Makefile.am @@ -9,11 +9,11 @@ endif libvdetap_la_SOURCES = libvdetap.c libvdetap_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version -export-dynamic -module -Wl,-init -Wl,libvdetap_init -Wl,-fini -Wl,libvdetap_fini # vdetaplib/libvdetap.c|85| warning: dereferencing type-punned pointer will break strict-aliasing rules -libvdetap_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing +libvdetap_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing AM_CPPFLAGS = -I$(top_srcdir)/include -DLIBEXECDIR=\"$(libexecdir)\" vdetap_SOURCES = vdetap.c -vdetap_LDADD = $(top_srcdir)/src/common/libvdecommon.la $(top_srcdir)/src/lib/libvdeplug.la +vdetap_LDADD = $(top_builddir)/src/common/libvdecommon.la $(top_builddir)/src/lib/libvdeplug.la EXTRA_DIST = test.c -- 2.11.4.GIT