[gnome-globalmenu] Rename libserver.la to libglobalmenu-server.la

[Yu Feng <fengy src gnome org>]

commit 2cb0abcd5e5c044c7c6c456cdf922ff27b4e4712
Author: Yu Feng <rainwoodman gmail com>
Date:   Wed Nov 11 10:56:38 2009 -0500

    Rename libserver.la to libglobalmenu-server.la

 configure.ac                                       |    2 +-
 libserver/Makefile.am                              |   19 +++++++++----------
 ...almenu-server.pc.in => globalmenu-server.pc.in} |    8 ++++----
 3 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3fcd5a0..3fae1ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -182,7 +182,7 @@ AC_CONFIG_FILES(
 	[Makefile
 	legacy-support/Makefile
 	libserver/Makefile
-	libserver/gnomeglobalmenu-server.pc
+	libserver/globalmenu-server.pc
 	libserver/tests/Makefile
 	libsettings/Makefile
 	libsettings/tests/Makefile
diff --git a/libserver/Makefile.am b/libserver/Makefile.am
index 0c4cb7f..9c8b91d 100644
--- a/libserver/Makefile.am
+++ b/libserver/Makefile.am
@@ -27,22 +27,21 @@ VALASOURCES = \
 	$(NULL)
 
 
-#mylibdir = $(libdir)/gnome-globalmenu
-lib_LTLIBRARIES = libserver.la
+lib_LTLIBRARIES = libglobalmenu-server.la
 
-libserver_includedir = $(includedir)/gnome-globalmenu
-libserver_include_HEADERS = globalmenu-server.h
+libglobalmenu_server_includedir = $(includedir)/gnome-globalmenu
+libglobalmenu_server_include_HEADERS = globalmenu-server.h
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gnomeglobalmenu-server.pc
+pkgconfig_DATA = globalmenu-server.pc
 
-libserver_la_SOURCES = \
+libglobalmenu_server_la_SOURCES = \
 						$(VALASOURCES:.vala=.c) \
 						$(HEADER_FILE) \
 						ccode/keygrab-ccode.c \
 						ccode/menushellutils-ccode.c 
 
-libserver_la_CPPFLAGS = \
+libglobalmenu_server_la_CPPFLAGS = \
 			 -I$(top_srcdir) \
 			 $(GTK_CFLAGS) \
 			 $(WNCK_CFLAGS) \
@@ -51,9 +50,9 @@ libserver_la_CPPFLAGS = \
 			 -include $(CONFIG_HEADER) \
 			 -include ../legacy-support/legacy-support.h
 
-libserver_la_LIBADD = ../legacy-support/liblegacy-support.la
+libglobalmenu_server_la_LIBADD = ../legacy-support/liblegacy-support.la
 
-libserver_la_LDFLAGS = -version-info 3:0:0 -Wl,--as-needed
+libglobalmenu_server_la_LDFLAGS = -version-info 3:0:0 -Wl,--as-needed
 
 vala-ccode: $(VALASOURCES) bindings.vapi
 	$(VALAC) $(VALA_DEFAULT_PKGS) \
@@ -77,5 +76,5 @@ EXTRA_DIST = \
 	globalmenu-server.deps \
 	bindings.vapi \
 	vala-ccode \
-	gnomeglobalmenu-server.pc.in
+	globalmenu-server.pc.in
 
diff --git a/libserver/gnomeglobalmenu-server.pc.in b/libserver/globalmenu-server.pc.in
similarity index 50%
rename from libserver/gnomeglobalmenu-server.pc.in
rename to libserver/globalmenu-server.pc.in
index a0fe61d..e3a99f6 100644
--- a/libserver/gnomeglobalmenu-server.pc.in
+++ b/libserver/globalmenu-server.pc.in
@@ -1,11 +1,11 @@
 prefix= prefix@
 exec_prefix= exec_prefix@
 libdir= libdir@
-includedir= includedir@
+pkgincludedir= pkgincludedir@
  
-Name: libgnomeglobalmenu-server
-Description: libgnomeglobalmenu-server
+Name: libglobalmenu-server
+Description: libglobalmenu-server
 Version: @VERSION@
 Libs: -L${libdir} -lserver
-Cflags: -I${includedir}/gnome-globalmenu
+Cflags: -I${pkgincludedir}
 Requires: gtk+-2.0 libwnck-1.0