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 | |
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>
-rw-r--r-- | client/Makefile.am | 5 | ||||
-rw-r--r-- | client/configure.ac | 2 | ||||
-rw-r--r-- | client/windows/ffmpeg_inc.h (renamed from common/win/ffmpeg_inc.h) | 0 | ||||
-rw-r--r-- | client/x11/Makefile.am | 1 | ||||
-rw-r--r-- | client/x11/ffmpeg_inc.h.in (renamed from common/linux/ffmpeg_inc.h.in) | 0 | ||||
-rw-r--r-- | common/Makefile.am | 6 | ||||
-rw-r--r-- | common/configure.ac | 2 | ||||
-rw-r--r-- | server/Makefile.am | 3 | ||||
-rw-r--r-- | server/configure.ac | 2 | ||||
-rw-r--r-- | server/ffmpeg_inc.h.in | 10 |
10 files changed, 21 insertions, 10 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/common/win/ffmpeg_inc.h b/client/windows/ffmpeg_inc.h index 8d4473ff..8d4473ff 100644 --- a/common/win/ffmpeg_inc.h +++ b/client/windows/ffmpeg_inc.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/common/linux/ffmpeg_inc.h.in b/client/x11/ffmpeg_inc.h.in index 7e322b51..7e322b51 100644 --- a/common/linux/ffmpeg_inc.h.in +++ b/client/x11/ffmpeg_inc.h.in 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/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 |