pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2025-12-31 02:41:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

spice: configure: mv ffmpeg_inc.h.in from common/ to client/

Browse Source 
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>
This commit is contained in:
Uri Lublin 2010-01-07 22:22:37 +02:00 committed by Yaniv Kamay
parent 4569295e5c
commit cf60cddbdd
10 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/Makefile.am
View File

@ -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)

2
client/configure.ac
View File

@ -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 ==========================================================================

0
common/win/ffmpeg_inc.h → client/windows/ffmpeg_inc.h
View File

1
client/x11/Makefile.am
View File

@ -15,7 +15,6 @@ INCLUDES = \
-I. \
-I.. \
-I$(COMMON_DIR) \
-I$(COMMON_DIR)/linux \
-I$(CLIENT_DIR) \
$(GL_CFLAGS) \
$(ALSA_CFLAGS) \

0
common/linux/ffmpeg_inc.h.in → client/x11/ffmpeg_inc.h.in
View File

6
common/Makefile.am
View File

@ -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)

2
common/configure.ac
View File

@ -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 ==========================================================================

3
server/Makefile.am
View File

@ -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:

2
server/configure.ac
View File

@ -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 ==========================================================================

10
server/ffmpeg_inc.h.in Normal file
View File

@ -0,0 +1,10 @@
#ifdef __GNUG__
extern "C" {
#endif
#include "@AVCODEC_PREFIX@avcodec.h"
#ifdef __GNUG__
}
#endif