LU-9324 lnet: move cyaml.h under lnet/include/

So that it can be included in other projects.

Signed-off-by: Bobi Jam <bobijam.xu@intel.com>
Change-Id: I980578742fd194e2464870f1ab8d6a9ae8deb9e2
Reviewed-on: https://review.whamcloud.com/26859
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Niu Yawei <yawei.niu@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lnet/utils/cyaml/cyaml.h b/lnet/include/cyaml.h
similarity index 100%
rename from lnet/utils/cyaml/cyaml.h
rename to lnet/include/cyaml.h

diff --git a/lnet/utils/cyaml/cyaml.c b/lnet/utils/cyaml/cyaml.c
index de8804b..cd8fac6 100644 (file)
--- a/lnet/utils/cyaml/cyaml.c
+++ b/lnet/utils/cyaml/cyaml.c
@@ -45,7 +45,7 @@
 #include <limits.h>
 #include <ctype.h>
 #include "libcfs/util/list.h"
-#include "cyaml.h"
+#include <cyaml.h>
 
 #define INDENT         4
 #define EXTRA_IND      2

diff --git a/lnet/utils/lnetconfig/Makefile.am b/lnet/utils/lnetconfig/Makefile.am
index 54e9a26..7da6071 100644 (file)
--- a/lnet/utils/lnetconfig/Makefile.am
+++ b/lnet/utils/lnetconfig/Makefile.am
@@ -29,7 +29,7 @@
 lib_LTLIBRARIES = liblnetconfig.la
 
 CYAML := $(top_builddir)/lnet/utils/cyaml/cyaml.c \
-        $(top_builddir)/lnet/utils/cyaml/cyaml.h
+        $(top_builddir)/lnet/include/cyaml.h
 liblnetconfig_la_SOURCES  = liblnetconfig.c liblnetconfig.h \
                            liblnetconfig_lnd.c liblnd.h $(CYAML)
 liblnetconfig_la_CPPFLAGS = -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 \

diff --git a/lnet/utils/lnetctl.c b/lnet/utils/lnetctl.c
index 819ce0b..70c986a 100644 (file)
--- a/lnet/utils/lnetctl.c
+++ b/lnet/utils/lnetctl.c
@@ -32,7 +32,7 @@
 #include <libcfs/util/parser.h>
 #include <lnet/lnetctl.h>
 #include <lnet/nidstr.h>
-#include "cyaml/cyaml.h"
+#include <cyaml.h>
 #include "lnetconfig/liblnetconfig.h"
 
 #define LNET_CONFIGURE         true