From 317f5bb969d2b9a7505cbe0d0a5f015903b6d9c2 Mon Sep 17 00:00:00 2001
From: HIGUCHI Yuta <y-higuchi@ak.jp.nec.com>
Date: Tue, 22 Jan 2013 20:29:19 +0900
Subject: [PATCH] Rename libtopology -> topology.  C API part for #3.

---
 src/examples/topology/show_switch_status.c | 2 --
 src/examples/topology/show_topology.c      | 2 --
 src/lib/{libtopology.c => topology.c}      | 2 +-
 src/lib/{libtopology.h => topology.h}      | 0
 src/lib/trema.h                            | 2 ++
 unittests/lib/libtopology_test.c           | 2 +-
 6 files changed, 4 insertions(+), 6 deletions(-)
 rename src/lib/{libtopology.c => topology.c} (99%)
 rename src/lib/{libtopology.h => topology.h} (100%)

diff --git a/src/examples/topology/show_switch_status.c b/src/examples/topology/show_switch_status.c
index 5aa32f9d9..a04abd222 100644
--- a/src/examples/topology/show_switch_status.c
+++ b/src/examples/topology/show_switch_status.c
@@ -21,8 +21,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include "trema.h"
-#include "libtopology.h"
-#include "topology_service_interface_option_parser.h"
 
 
 void
diff --git a/src/examples/topology/show_topology.c b/src/examples/topology/show_topology.c
index 9e8fbf3c9..a91dc9a23 100644
--- a/src/examples/topology/show_topology.c
+++ b/src/examples/topology/show_topology.c
@@ -21,8 +21,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include "trema.h"
-#include "libtopology.h"
-#include "topology_service_interface_option_parser.h"
 
 
 struct dpid_entry {
diff --git a/src/lib/libtopology.c b/src/lib/topology.c
similarity index 99%
rename from src/lib/libtopology.c
rename to src/lib/topology.c
index 134a6a454..92f86f344 100644
--- a/src/lib/libtopology.c
+++ b/src/lib/topology.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <netinet/in.h>
 #include "trema.h"
-#include "libtopology.h"
+#include "topology.h"
 
 static char *libtopology_queue_name = NULL;
 static char *topology_name = NULL;
diff --git a/src/lib/libtopology.h b/src/lib/topology.h
similarity index 100%
rename from src/lib/libtopology.h
rename to src/lib/topology.h
diff --git a/src/lib/trema.h b/src/lib/trema.h
index 076061d94..4e7d66ab3 100644
--- a/src/lib/trema.h
+++ b/src/lib/trema.h
@@ -45,6 +45,8 @@
 #include "persistent_storage.h"
 #include "stat.h"
 #include "timer.h"
+#include "topology.h"
+#include "topology_service_interface_option_parser.h"
 #include "utility.h"
 #include "wrapper.h"
 
diff --git a/unittests/lib/libtopology_test.c b/unittests/lib/libtopology_test.c
index 9d769f733..e44b08d43 100644
--- a/unittests/lib/libtopology_test.c
+++ b/unittests/lib/libtopology_test.c
@@ -14,7 +14,7 @@
 #include "checks.h"
 #include "cmockery_trema.h"
 
-#include "libtopology.h"
+#include "topology.h"
 
 #include "event_handler.h"
 #include "messenger.h"