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 /client | |
| 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 'client')
| -rw-r--r-- | client/Makefile.am | 5 | ||||
| -rw-r--r-- | client/configure.ac | 2 | ||||
| -rw-r--r-- | client/windows/ffmpeg_inc.h | 4 | ||||
| -rw-r--r-- | client/x11/Makefile.am | 1 | ||||
| -rw-r--r-- | client/x11/ffmpeg_inc.h.in | 12 |
5 files changed, 21 insertions, 3 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index e948b5f7..54cd2ec4 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 d9012deb..f6e91168 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/client/windows/ffmpeg_inc.h b/client/windows/ffmpeg_inc.h new file mode 100644 index 00000000..8d4473ff --- /dev/null +++ b/client/windows/ffmpeg_inc.h @@ -0,0 +1,4 @@ + +extern "C" { +#include "libavcodec/avcodec.h" +} diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am index 9a8e5556..1fd0eaf7 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/client/x11/ffmpeg_inc.h.in b/client/x11/ffmpeg_inc.h.in new file mode 100644 index 00000000..7e322b51 --- /dev/null +++ b/client/x11/ffmpeg_inc.h.in @@ -0,0 +1,12 @@ + +#ifdef __GNUG__ +extern "C" { +#endif + +#include "@AVCODEC_PREFIX@avcodec.h" + +#ifdef __GNUG__ +} +#endif + + |