summaryrefslogtreecommitdiffstats
path: root/common/Makefile.am
diff options
context:
space:
mode:
authorUri Lublin <uril@redhat.com>2010-01-07 22:22:37 +0200
committerYaniv Kamay <ykamay@redhat.com>2010-01-10 19:46:36 +0200
commitcf60cddbdd3468ec49d387f1944c068bd35fca92 (patch)
tree1444a8033094d92f6e2013e53ae903e5e27396f6 /common/Makefile.am
parent4569295e5c74de4fd3c36af4216e2f42e809e9e0 (diff)
downloadspice-cf60cddbdd3468ec49d387f1944c068bd35fca92.tar.gz
spice-cf60cddbdd3468ec49d387f1944c068bd35fca92.tar.xz
spice-cf60cddbdd3468ec49d387f1944c068bd35fca92.zip
spice: configure: mv ffmpeg_inc.h.in from common/ to client/
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 <ykamay@rehdat.com> Signed-off-by: Uri Lublin <uril@redhat.com>
Diffstat (limited to 'common/Makefile.am')
-rw-r--r--common/Makefile.am6
1 files changed, 2 insertions, 4 deletions
diff --git a/common/Makefile.am b/common/Makefile.am
index 8f96366b..bdff878c 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)
+