Each subdir (common, client and server) can "make dist".
This commit adds configure.ac.shared and autogen.sh to the tar file.
Above files are copied from .. (spice/ directory)
Also added configure.ac.shared (which is not part of "distribution" tarball)
that only imports ../configure.ac.shared such that ./autogen.sh still
works (on "git directories").
Signed-off-by: Uri Lublin <u...@redhat.com>
---
client/Makefile.am | 3 +++
client/configure.ac | 2 +-
client/configure.ac.shared | 1 +
common/Makefile.am | 3 +++
common/configure.ac | 2 +-
common/configure.ac.shared | 1 +
server/Makefile.am | 3 +++
server/configure.ac | 2 +-
server/configure.ac.shared | 1 +
9 files changed, 15 insertions(+), 3 deletions(-)
create mode 100644 client/configure.ac.shared
create mode 100644 common/configure.ac.shared
create mode 100644 server/configure.ac.shared
diff --git a/client/Makefile.am b/client/Makefile.am
index f30408c..e948b5f 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -87,3 +87,6 @@ RED_COMMON_SRCS = \
$(NULL)
EXTRA_DIST = $(RED_COMMON_SRCS)
+
+dist-hook:
+ cp -p -f ../autogen.sh ../configure.ac.shared $(distdir)
diff --git a/client/configure.ac b/client/configure.ac
index c1fd5b7..d9012de 100644
--- a/client/configure.ac
+++ b/client/configure.ac
@@ -12,7 +12,7 @@ AC_CONFIG_MACRO_DIR([m4])
# Maybe overwritten by ../configure.ac.shared
SPICE_COMMON_SRCDIR='$(top_srcdir)'/../common
-m4_include(../configure.ac.shared)
+m4_include(configure.ac.shared)
dnl ================
diff --git a/client/configure.ac.shared b/client/configure.ac.shared
new file mode 100644
index 0000000..4c292cb
--- /dev/null
+++ b/client/configure.ac.shared
@@ -0,0 +1 @@
+m4_include(../configure.ac.shared)
diff --git a/common/Makefile.am b/common/Makefile.am
index c1a55f1..8f96366 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -57,3 +57,6 @@ linux_includedir=$(common_srcdir)/linux
linux_include_DATA=linux/ffmpeg_inc.h
DISTCLEANFILES = spice-common.pc linux/ffmpeg_inc.h
+
+dist-hook:
+ cp -p -f ../autogen.sh ../configure.ac.shared $(distdir)
diff --git a/common/configure.ac b/common/configure.ac
index 76318e6..b2d7e22 100644
--- a/common/configure.ac
+++ b/common/configure.ac
@@ -8,7 +8,7 @@ AC_INIT(spice-common, [SPICE_MAJOR.SPICE_MINOR.SPICE_MICRO],
[], spice-common)
AC_CONFIG_MACRO_DIR([m4])
-m4_include(../configure.ac.shared)
+m4_include(configure.ac.shared)
AC_CONFIG_FILES([Makefile linux/ffmpeg_inc.h spice-common.pc])
AC_OUTPUT
diff --git a/common/configure.ac.shared b/common/configure.ac.shared
new file mode 100644
index 0000000..4c292cb
--- /dev/null
+++ b/common/configure.ac.shared
@@ -0,0 +1 @@
+m4_include(../configure.ac.shared)
diff --git a/server/Makefile.am b/server/Makefile.am
index f092fd1..335a71a 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -88,3 +88,6 @@ pkgconfig_DATA = spice.pc
DISTCLEANFILES = \
spice.pc
+
+dist-hook:
+ cp -p -f ../autogen.sh ../configure.ac.shared $(distdir)
diff --git a/server/configure.ac b/server/configure.ac
index d047078..bc31986 100644
--- a/server/configure.ac
+++ b/server/configure.ac
@@ -12,7 +12,7 @@ AC_CONFIG_MACRO_DIR([m4])
# Maybe overwritten by ../configure.ac.shared
SPICE_COMMON_SRCDIR='$(top_srcdir)'/../common
-m4_include(../configure.ac.shared)
+m4_include(configure.ac.shared)
AC_PROG_LIBTOOL
diff --git a/server/configure.ac.shared b/server/configure.ac.shared
new file mode 100644
index 0000000..4c292cb
--- /dev/null
+++ b/server/configure.ac.shared
@@ -0,0 +1 @@
+m4_include(../configure.ac.shared)
--
1.6.5.2
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
Spice-space-devel mailing list
Spice-space-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spice-space-devel
