summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUri Lublin <uril@redhat.com>2010-03-14 13:01:13 +0200
committerUri Lublin <uril@redhat.com>2010-03-24 19:19:35 +0200
commit0803fa692d76f2b1021f62e3d2dbed581de46ec8 (patch)
tree318bff6a28133574394aab875a45cfa1d7915329
parent56196e79bb4404c60fc8e0431c2506e495c9a0d8 (diff)
downloadspice-server-0.4.2-8.el6.tar.gz
spice-server-0.4.2-8.el6.tar.xz
spice-server-0.4.2-8.el6.zip
spice server: renaming library and includedir #573349spice-server-0.4.2-8.el6spice-client-0.4.2-8.el6
Current library's .so* files conflict with tclspice package found in EPEL. Renamed library's .so files (added "-server") Include directory was "libspice", now "spice-server" for consistency.
-rw-r--r--server/Makefile.am14
-rw-r--r--server/spice-server.pc.in4
2 files changed, 9 insertions, 9 deletions
diff --git a/server/Makefile.am b/server/Makefile.am
index 3cd9a70e..3a397c9c 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -29,14 +29,14 @@ COMMON_SRCS = \
$(COMMON_DIR)/canvas_utils.c \
$(NULL)
-lib_LTLIBRARIES = libspice.la
+lib_LTLIBRARIES = libspice-server.la
-libspice_la_LDFLAGS = \
+libspice_server_la_LDFLAGS = \
-version-number $(SPICE_LT_VERSION) \
-no-undefined \
$(NULL)
-libspice_la_LIBADD = \
+libspice_server_la_LIBADD = \
$(GL_LIBS) \
$(FFMPEG_LIBS) \
$(QCAIRO_LIBS) \
@@ -45,7 +45,7 @@ libspice_la_LIBADD = \
$(LIBRT) \
$(NULL)
-libspice_la_SOURCES = \
+libspice_server_la_SOURCES = \
glz_encoder.c \
glz_encoder_config.h \
glz_encoder_dictionary.c \
@@ -70,9 +70,9 @@ libspice_la_SOURCES = \
vd_interface.h \
$(NULL)
-nodist_libspice_la_SOURCES = $(COMMON_SRCS)
-libspiceincludedir = $(includedir)/libspice
-libspiceinclude_HEADERS = \
+nodist_libspice_server_la_SOURCES = $(COMMON_SRCS)
+libspice_serverincludedir = $(includedir)/spice-server
+libspice_serverinclude_HEADERS = \
spice.h \
vd_interface.h \
$(NULL)
diff --git a/server/spice-server.pc.in b/server/spice-server.pc.in
index 5639f4ae..69c80f34 100644
--- a/server/spice-server.pc.in
+++ b/server/spice-server.pc.in
@@ -8,6 +8,6 @@ Description: SPICE server library
Version: @VERSION@
Requires: @SPICE_REQUIRES@
-Libs: -L${libdir} -lspice
+Libs: -L${libdir} -lspice-server
Libs.private: @SPICE_NONPKGCONFIG_LIBS@
-Cflags: -I${includedir}/libspice
+Cflags: -I${includedir}/spice-server