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 /server | |
| 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 'server')
| -rw-r--r-- | server/Makefile.am | 3 | ||||
| -rw-r--r-- | server/configure.ac | 2 | ||||
| -rw-r--r-- | server/ffmpeg_inc.h.in | 10 |
3 files changed, 13 insertions, 2 deletions
diff --git a/server/Makefile.am b/server/Makefile.am index 335a71a5..5df058cd 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 bc31986a..9ca80d51 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/server/ffmpeg_inc.h.in b/server/ffmpeg_inc.h.in new file mode 100644 index 00000000..02b4e360 --- /dev/null +++ b/server/ffmpeg_inc.h.in @@ -0,0 +1,10 @@ + +#ifdef __GNUG__ +extern "C" { +#endif + +#include "@AVCODEC_PREFIX@avcodec.h" + +#ifdef __GNUG__ +} +#endif |