From a7b43581ce5e14410e779010b25abb0cd2afed3e Mon Sep 17 00:00:00 2001
From: Jeremy Lakeman <Jeremy.Lakeman@gmail.com>
Date: Wed, 12 Feb 2014 14:29:13 +1030
Subject: [PATCH] Rename libservald to libserval for consistency with android
 build

---
 Android.mk                                           | 2 +-
 Makefile.in                                          | 2 +-
 java/org/servalproject/servaldna/ServalDCommand.java | 2 +-
 testdefs.sh                                          | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Android.mk b/Android.mk
index 36620191..92dfa9ad 100644
--- a/Android.mk
+++ b/Android.mk
@@ -46,7 +46,7 @@ LOCAL_SRC_FILES:= $(SERVALD_SRC_FILES) $(SERVAL_BASE)version_servald.c
 LOCAL_CFLAGS += $(SERVALD_LOCAL_CFLAGS) -Iserval-dna/nacl/include
 LOCAL_LDLIBS := $(SERVALD_LOCAL_LDLIBS)
 LOCAL_STATIC_LIBRARIES := $(SERVALD_LOCAL_STATIC_LIBRARIES)
-LOCAL_MODULE:= servald
+LOCAL_MODULE:= serval
 include $(BUILD_SHARED_LIBRARY)
 
 # Build libserval.so wrapper
diff --git a/Makefile.in b/Makefile.in
index ebcbf6ee..b7a96eeb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -148,7 +148,7 @@ COPYRIGHT_TOOL := $(call findPATH,sp-copyright-tool)
 
 # This does not build on 64 bit elf platforms as NaCL isn't built with -fPIC
 # DOC 20120615
-libservald.so: $(OBJS) version.o
+libserval.so: $(OBJS) version.o
 	@echo LINK $@
 	@$(CC) $(CFLAGS) -Wall -shared -o $@ $(OBJS) version.o $(LDFLAGS)
 
diff --git a/java/org/servalproject/servaldna/ServalDCommand.java b/java/org/servalproject/servaldna/ServalDCommand.java
index 164a8cc5..68eba17e 100644
--- a/java/org/servalproject/servaldna/ServalDCommand.java
+++ b/java/org/servalproject/servaldna/ServalDCommand.java
@@ -29,7 +29,7 @@ public class ServalDCommand
 
 	static
 	{
-		System.loadLibrary("servald");
+		System.loadLibrary("serval");
 	}
 
 	/**
diff --git a/testdefs.sh b/testdefs.sh
index 5620d278..066e9719 100644
--- a/testdefs.sh
+++ b/testdefs.sh
@@ -244,10 +244,10 @@ foreach_instance_with_pidfile() {
 }
 
 # Utility function for setting up servald JNI fixtures:
-#  - check that libservald.so is present
-#  - set LD_LIBRARY_PATH so that libservald.so can be found
+#  - check that libserval.so is present
+#  - set LD_LIBRARY_PATH so that libserval.so can be found
 setup_servald_so() {
-   assert [ -r "$servald_build_root/libservald.so" ]
+   assert [ -r "$servald_build_root/libserval.so" ]
    export LD_LIBRARY_PATH="$servald_build_root"
 }