[Spice-commits] server/Makefile.am spice-server.pc.in

[Alexander Larsson]

 server/Makefile.am |   12 ++++++------
 spice-server.pc.in |    4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit e9b5846704a65a8e8b59bea65e4711f5e137d2b6
Author: Alexander Larsson <alexl at redhat.com>
Date:   Wed Mar 24 17:13:42 2010 +0100

    Rename .so spice-server.so
    
    Also change include dir to "spice-server" for consistency.
    
    libspice.so conflicted with the tclspice package, and its also
    a clarification for when we create a spice client library.

diff --git a/server/Makefile.am b/server/Makefile.am
index 0b6cb13..0fe1c0e 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -33,14 +33,14 @@ COMMON_SRCS = 						\
 	$(top_srcdir)/common/mem.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)				\
 	$(PIXMAN_LIBS)				\
@@ -50,7 +50,7 @@ libspice_la_LIBADD = 				\
 	$(LIBRT)				\
 	$(NULL)
 
-libspice_la_SOURCES =				\
+libspice_server_la_SOURCES =			\
 	glz_encoder.c				\
 	glz_encoder_config.h			\
 	glz_encoder_dictionary.c		\
@@ -80,8 +80,8 @@ libspice_la_SOURCES =				\
 	$(COMMON_SRCS)				\
 	$(NULL)
 
-libspiceincludedir = $(includedir)/libspice
-libspiceinclude_HEADERS =               	\
+libspice_serverincludedir = $(includedir)/spice-server
+libspice_serverinclude_HEADERS =               	\
 	spice.h					\
 	vd_interface.h				\
 	$(NULL)
diff --git a/spice-server.pc.in b/spice-server.pc.in
index 5639f4a..69c80f3 100644
--- a/spice-server.pc.in
+++ b/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