Move saiserialize and saiattributelist to meta dir (sonic-net#97)

dmytroxshevchuk · Oct 24, 2016 · e8ce8e5 · e8ce8e5
1 parent fc7976d
commit e8ce8e5
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git a/lib/inc/sai_redis.h b/lib/inc/sai_redis.h
@@ -11,8 +11,8 @@
 extern "C" {
 #include "sai.h"
 }
-#include "saiserialize.h"
-#include "saiattributelist.h"
+#include "meta/saiserialize.h"
+#include "meta/saiattributelist.h"
 #include "redisclient.h"
 
 #include "swss/dbconnector.h"

diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am
@@ -81,8 +81,8 @@ libsairedis_la_SOURCES = \
 			 sai_redis_notifications.cpp \
 			 sai_redis_record.cpp \
 			 ../../common/redisclient.cpp \
-			 ../../common/saiserialize.cpp \
-			 ../../common/saiattributelist.cpp \
+			 ../../meta/saiserialize.cpp \
+			 ../../meta/saiattributelist.cpp \
 			 ../../meta/sai_meta.cpp \
 			 ../../meta/sai_meta_sanity.cpp \
 			 ../../meta/sai_meta_acl.cpp \

diff --git a/meta/sai_meta.h b/meta/sai_meta.h
@@ -14,7 +14,7 @@ extern "C" {
 }
 
 #include "swss/logger.h"
-#include "common/saiserialize.h"
+#include "saiserialize.h"
 
 #define MAX_LIST_COUNT 128
 

diff --git a/common/saiattributelist.cpp → meta/saiattributelist.cpp b/common/saiattributelist.cpp → meta/saiattributelist.cpp
diff --git a/common/saiattributelist.h → meta/saiattributelist.h b/common/saiattributelist.h → meta/saiattributelist.h
diff --git a/common/saiserialize.cpp → meta/saiserialize.cpp b/common/saiserialize.cpp → meta/saiserialize.cpp
diff --git a/common/saiserialize.h → meta/saiserialize.h b/common/saiserialize.h → meta/saiserialize.h
diff --git a/syncd/Makefile.am b/syncd/Makefile.am
@@ -28,8 +28,8 @@ syncd_SOURCES = syncd.cpp \
 		syncd_notifications.cpp \
 		syncd_counters.cpp \
 		../common/redisclient.cpp \
-		../common/saiserialize.cpp \
-		../common/saiattributelist.cpp
+		../meta/saiserialize.cpp \
+		../meta/saiattributelist.cpp
 
 syncd_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) \
 				 -I$(top_srcdir)/lib/inc \

diff --git a/syncd/syncd.h b/syncd/syncd.h
@@ -26,8 +26,8 @@ extern "C" {
 }
 
 #include "common/redisclient.h"
-#include "common/saiserialize.h"
-#include "common/saiattributelist.h"
+#include "meta/saiserialize.h"
+#include "meta/saiattributelist.h"
 #include "swss/dbconnector.h"
 #include "swss/producertable.h"
 #include "swss/consumertable.h"

diff --git a/vslib/inc/sai_vs_state.h b/vslib/inc/sai_vs_state.h
@@ -6,8 +6,8 @@
 
 #include "sai_meta.h"
 
-#include "saiserialize.h"
-#include "saiattributelist.h"
+#include "meta/saiserialize.h"
+#include "meta/saiattributelist.h"
 
 typedef std::unordered_map<std::string, std::string> AttrHash;
 typedef std::unordered_map<std::string, AttrHash> ObjectHash;

diff --git a/vslib/src/Makefile.am b/vslib/src/Makefile.am
@@ -52,8 +52,8 @@ endif
 lib_LTLIBRARIES = libsai.la
 
 libsai_la_SOURCES = \
-					../../common/saiattributelist.cpp \
-					../../common/saiserialize.cpp \
+					../../meta/saiattributelist.cpp \
+					../../meta/saiserialize.cpp \
 					../../meta/sai_meta_acl.cpp \
 					../../meta/sai_meta_buffer.cpp \
 					../../meta/sai_meta.cpp \