Moved common/win/ffmpeg_inc.h to client/windows/
Moved common/linux/ffmpeg_inc.h.in to client/x11/
Copied common/linux/ffmpeg_inc.h.in to server/
Update *configure.ac and */Makefile.am accordingly (* is
for {common,server,client}
Signed-off-by: Yaniv Kamay <yka...@rehdat.com>
Signed-off-by: Uri Lublin <u...@redhat.com>
---
client/Makefile.am | 5 ++++-
client/configure.ac | 2 +-
{common/win => client/windows}/ffmpeg_inc.h | 0
client/x11/Makefile.am | 1 -
{common/linux => client/x11}/ffmpeg_inc.h.in | 0
common/Makefile.am | 6 ++----
common/configure.ac | 2 +-
server/Makefile.am | 3 ++-
server/configure.ac | 2 +-
{common/linux => server}/ffmpeg_inc.h.in | 2 --
10 files changed, 11 insertions(+), 12 deletions(-)
rename {common/win => client/windows}/ffmpeg_inc.h (100%)
copy {common/linux => client/x11}/ffmpeg_inc.h.in (100%)
rename {common/linux => server}/ffmpeg_inc.h.in (98%)
diff --git a/client/Makefile.am b/client/Makefile.am
index e948b5f..54cd2ec 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -86,7 +86,10 @@ RED_COMMON_SRCS = \
gdi_canvas.cpp \
$(NULL)
-EXTRA_DIST = $(RED_COMMON_SRCS)
+EXTRA_DIST = $(RED_COMMON_SRCS) \
+ x11/ffmpeg_inc.h.in
+
+DISTCLEANFILES = x11/ffmpeg_inc.h
dist-hook:
cp -p -f ../autogen.sh ../configure.ac.shared $(distdir)
diff --git a/client/configure.ac b/client/configure.ac
index d9012de..f6e9116 100644
--- a/client/configure.ac
+++ b/client/configure.ac
@@ -57,7 +57,7 @@ AC_SUBST(SPICE_REQUIRES)
AC_SUBST(SPICE_NONPKGCONFIG_CFLAGS)
AC_SUBST(SPICE_NONPKGCONFIG_LIBS)
-AC_CONFIG_FILES([Makefile x11/Makefile x11/images/Makefile])
+AC_CONFIG_FILES([Makefile x11/Makefile x11/images/Makefile x11/ffmpeg_inc.h])
AC_OUTPUT
dnl ==========================================================================
diff --git a/common/win/ffmpeg_inc.h b/client/windows/ffmpeg_inc.h
similarity index 100%
rename from common/win/ffmpeg_inc.h
rename to client/windows/ffmpeg_inc.h
diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am
index 9a8e555..1fd0eaf 100644
--- a/client/x11/Makefile.am
+++ b/client/x11/Makefile.am
@@ -15,7 +15,6 @@ INCLUDES = \
-I. \
-I.. \
-I$(COMMON_DIR) \
- -I$(COMMON_DIR)/linux \
-I$(CLIENT_DIR) \
$(GL_CFLAGS) \
$(ALSA_CFLAGS) \
diff --git a/common/linux/ffmpeg_inc.h.in b/client/x11/ffmpeg_inc.h.in
similarity index 100%
copy from common/linux/ffmpeg_inc.h.in
copy to client/x11/ffmpeg_inc.h.in
diff --git a/common/Makefile.am b/common/Makefile.am
index 8f96366..bdff878 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -53,10 +53,8 @@ pkgconfig_DATA = spice-common.pc
common_srcdir=$(prefix)/src/spice-common
common_src_DATA = $(COMMON_SRCS)
-linux_includedir=$(common_srcdir)/linux
-linux_include_DATA=linux/ffmpeg_inc.h
-
-DISTCLEANFILES = spice-common.pc linux/ffmpeg_inc.h
+DISTCLEANFILES = spice-common.pc
dist-hook:
cp -p -f ../autogen.sh ../configure.ac.shared $(distdir)
+
diff --git a/common/configure.ac b/common/configure.ac
index b2d7e22..0e51316 100644
--- a/common/configure.ac
+++ b/common/configure.ac
@@ -10,7 +10,7 @@ AC_CONFIG_MACRO_DIR([m4])
m4_include(configure.ac.shared)
-AC_CONFIG_FILES([Makefile linux/ffmpeg_inc.h spice-common.pc])
+AC_CONFIG_FILES([Makefile spice-common.pc])
AC_OUTPUT
dnl ==========================================================================
diff --git a/server/Makefile.am b/server/Makefile.am
index 335a71a..5df058c 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -5,7 +5,6 @@ COMMON_DIR=$(SPICE_COMMON_SRCDIR)
INCLUDES = \
-I. \
-I$(COMMON_DIR) \
- -I$(COMMON_DIR)/linux \
$(FFMPEG_CFLAGS) \
$(QCAIRO_CFLAGS) \
$(GL_CFLAGS) \
@@ -81,12 +80,14 @@ libspiceinclude_HEADERS = \
EXTRA_DIST = \
glz_encode_match_tmpl.c \
glz_encode_tmpl.c \
+ ffmpeg_inc.h.in \
$(NULL)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = spice.pc
DISTCLEANFILES = \
+ ffmpeg_inc.h \
spice.pc
dist-hook:
diff --git a/server/configure.ac b/server/configure.ac
index bc31986..9ca80d5 100644
--- a/server/configure.ac
+++ b/server/configure.ac
@@ -32,7 +32,7 @@ AC_SUBST(SPICE_REQUIRES)
AC_SUBST(SPICE_NONPKGCONFIG_CFLAGS)
AC_SUBST(SPICE_NONPKGCONFIG_LIBS)
-AC_CONFIG_FILES([Makefile spice.pc])
+AC_CONFIG_FILES([Makefile spice.pc ffmpeg_inc.h])
AC_OUTPUT
dnl ==========================================================================
diff --git a/common/linux/ffmpeg_inc.h.in b/server/ffmpeg_inc.h.in
similarity index 98%
rename from common/linux/ffmpeg_inc.h.in
rename to server/ffmpeg_inc.h.in
index 7e322b5..02b4e36 100644
--- a/common/linux/ffmpeg_inc.h.in
+++ b/server/ffmpeg_inc.h.in
@@ -8,5 +8,3 @@ extern "C" {
#ifdef __GNUG__
}
#endif
-
-
--
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
