diff options
| author | Uri Lublin <uril@redhat.com> | 2010-01-07 22:22:37 +0200 |
|---|---|---|
| committer | Yaniv Kamay <ykamay@redhat.com> | 2010-01-10 19:46:36 +0200 |
| commit | cf60cddbdd3468ec49d387f1944c068bd35fca92 (patch) | |
| tree | 1444a8033094d92f6e2013e53ae903e5e27396f6 /common | |
| parent | 4569295e5c74de4fd3c36af4216e2f42e809e9e0 (diff) | |
| download | spice-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')
| -rw-r--r-- | common/Makefile.am | 6 | ||||
| -rw-r--r-- | common/configure.ac | 2 | ||||
| -rw-r--r-- | common/linux/ffmpeg_inc.h.in | 12 | ||||
| -rw-r--r-- | common/win/ffmpeg_inc.h | 4 |
4 files changed, 3 insertions, 21 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) + diff --git a/common/configure.ac b/common/configure.ac index b2d7e22e..0e513160 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/common/linux/ffmpeg_inc.h.in b/common/linux/ffmpeg_inc.h.in deleted file mode 100644 index 7e322b51..00000000 --- a/common/linux/ffmpeg_inc.h.in +++ /dev/null @@ -1,12 +0,0 @@ - -#ifdef __GNUG__ -extern "C" { -#endif - -#include "@AVCODEC_PREFIX@avcodec.h" - -#ifdef __GNUG__ -} -#endif - - diff --git a/common/win/ffmpeg_inc.h b/common/win/ffmpeg_inc.h deleted file mode 100644 index 8d4473ff..00000000 --- a/common/win/ffmpeg_inc.h +++ /dev/null @@ -1,4 +0,0 @@ - -extern "C" { -#include "libavcodec/avcodec.h" -} |