Consistently use <lxc/lxccontainer.h> for the API

The API header was included in a variety of ways before, standardize
those to "include <lxc/lxccontainer.h>" as this will always work both in
tree and on a system with the headers installed.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/lxc/bdev.h b/src/lxc/bdev.h
index f9d9a0cb3fe1a33bc7953a059c37afe59192514d..a603d9e95b16da0461866cb601ff33f085d4cdc9 100644 (file)
--- a/src/lxc/bdev.h
+++ b/src/lxc/bdev.h
@@ -29,7 +29,7 @@
  */
 
 #include "config.h"
-#include "lxccontainer.h"
+#include <lxc/lxccontainer.h>
 
 struct bdev;
 

diff --git a/src/lxc/console.c b/src/lxc/console.c
index 78be4031d5643bf086548afb7e80552220574132..d854dbb66eabe3061e1018c9c52c8a8daf322572 100644 (file)
--- a/src/lxc/console.c
+++ b/src/lxc/console.c
@@ -31,7 +31,7 @@
 #include <sys/types.h>
 #include <termios.h>
 
-#include "lxccontainer.h"
+#include <lxc/lxccontainer.h>
 #include "log.h"
 #include "conf.h"
 #include "config.h"

diff --git a/src/lxc/lxc_clone.c b/src/lxc/lxc_clone.c
index 8b5c6e957d2802565e2367b22878ff5b4b4db0d8..e0be9da3fa4d7f22d66b864b3c223b0f1d73574a 100644 (file)
--- a/src/lxc/lxc_clone.c
+++ b/src/lxc/lxc_clone.c
@@ -32,7 +32,7 @@
 #include "lxc.h"
 #include "conf.h"
 #include "state.h"
-#include "lxccontainer.h"
+#include <lxc/lxccontainer.h>
 
 lxc_log_define(lxc_clone, lxc);
 

diff --git a/src/lxc/lxc_config.c b/src/lxc/lxc_config.c
index b3f2ed89796bfba602b1bbf67998fbdaffe33587..c90be7dca911c44473bfe766993ab2a7e4e3eadc 100644 (file)
--- a/src/lxc/lxc_config.c
+++ b/src/lxc/lxc_config.c
@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 #include "config.h"
-#include "lxccontainer.h"
+#include <lxc/lxccontainer.h>
 
 struct lxc_config_items {
        char *name;

diff --git a/src/lxc/lxc_console.c b/src/lxc/lxc_console.c
index 28ad772448b9d121605239c708d38082dabb78a2..ea1e9993fff840a2bba678e2a4b1e9cfa4b4973d 100644 (file)
--- a/src/lxc/lxc_console.c
+++ b/src/lxc/lxc_console.c
@@ -38,7 +38,7 @@
 #include <sys/poll.h>
 #include <sys/ioctl.h>
 
-#include "../lxc/lxccontainer.h"
+#include <lxc/lxccontainer.h>
 #include "error.h"
 #include "lxc.h"
 #include "log.h"

diff --git a/src/lxc/lxc_create.c b/src/lxc/lxc_create.c
index 4f205e8ae437d1a2aba14838f7e09a89783c8443..f577e3005ee569da3471369182ab79dfa9ed4e8a 100644 (file)
--- a/src/lxc/lxc_create.c
+++ b/src/lxc/lxc_create.c
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "../lxc/lxccontainer.h"
+#include <lxc/lxccontainer.h>
 
 #include <stdio.h>
 #include <libgen.h>

diff --git a/src/lxc/lxc_destroy.c b/src/lxc/lxc_destroy.c
index 0724eb80821355075f9c2e15f26897b9d501cb66..a1f73ca83f3945d7b725ff14554355c91572d461 100644 (file)
--- a/src/lxc/lxc_destroy.c
+++ b/src/lxc/lxc_destroy.c
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "../lxc/lxccontainer.h"
+#include <lxc/lxccontainer.h>
 
 #include <stdio.h>
 #include <libgen.h>

diff --git a/src/lxc/lxc_snapshot.c b/src/lxc/lxc_snapshot.c
index 0177f5dd829546d52184220999f459e207774e7e..c21563f602f2983792d4d51fba3d0838d7f04e64 100644 (file)
--- a/src/lxc/lxc_snapshot.c
+++ b/src/lxc/lxc_snapshot.c
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "../lxc/lxccontainer.h"
+#include <lxc/lxccontainer.h>
 
 #include <stdio.h>
 #include <libgen.h>

diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c
index a30a9f683d927dd066c6f2abfca2f212047cab48..a894513bcc9db9c82bacf46a7c509540d9b1e8c3 100644 (file)
--- a/src/lxc/lxc_start.c
+++ b/src/lxc/lxc_start.c
@@ -43,7 +43,7 @@
 #include "log.h"
 #include "caps.h"
 #include "lxc.h"
-#include "lxccontainer.h"
+#include <lxc/lxccontainer.h>
 #include "conf.h"
 #include "cgroup.h"
 #include "utils.h"

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 5c49b8bfeb7a8cf767cfe358a5059d5f3e41428f..ea5a84efc61238245a658fb797c29289c3193629 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "lxc.h"
 #include "state.h"
-#include "lxccontainer.h"
+#include <lxc/lxccontainer.h>
 #include "conf.h"
 #include "confile.h"
 #include "console.h"

diff --git a/src/tests/cgpath.c b/src/tests/cgpath.c
index f9aaced74b0b5cca7e2d1276000d9ddb8094b809..26a79c390e45d142e463a77c4d7e13fd7ce7c829 100644 (file)
--- a/src/tests/cgpath.c
+++ b/src/tests/cgpath.c
@@ -16,7 +16,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include "../lxc/lxccontainer.h"
+#include <lxc/lxccontainer.h>
 
 #include <limits.h>
 #include <unistd.h>

diff --git a/src/tests/clonetest.c b/src/tests/clonetest.c
index da3ce75269ff4a1a9d7e847723b3652a1cd2eb01..b04ab3c6b29ef18f67806f0a30cbe6510075f7b9 100644 (file)
--- a/src/tests/clonetest.c
+++ b/src/tests/clonetest.c
@@ -16,7 +16,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include "../lxc/lxccontainer.h"
+#include <lxc/lxccontainer.h>
 
 #include <unistd.h>
 #include <signal.h>

diff --git a/src/tests/concurrent.c b/src/tests/concurrent.c
index c8a1368035cc2cd621115b281db54af0ba4dd4fa..6673f3aa8b3e0218f74dfee124ec1ce3497d1aa2 100644 (file)
--- a/src/tests/concurrent.c
+++ b/src/tests/concurrent.c
@@ -23,7 +23,7 @@
 #define _GNU_SOURCE
 #include <getopt.h>
 
-#include "../lxc/lxccontainer.h"
+#include <lxc/lxccontainer.h>
 
 static int nthreads = 5;
 static int iterations = 1;

diff --git a/src/tests/console.c b/src/tests/console.c
index cd639810980e70656e12c72f003fd044382b132d..33d6ad27827ef42c5a4de59d8bb7ca1cd7517e6e 100644 (file)
--- a/src/tests/console.c
+++ b/src/tests/console.c
@@ -19,7 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "../lxc/lxccontainer.h"
+#include <lxc/lxccontainer.h>
 
 #include <errno.h>
 #include <unistd.h>

diff --git a/src/tests/containertests.c b/src/tests/containertests.c
index 8d1658fab4e7d8f1c9adff24cd5e2075107f4ebc..e463e352e7e3ca54e81dd550e0b9ddd55c34e346 100644 (file)
--- a/src/tests/containertests.c
+++ b/src/tests/containertests.c
@@ -16,7 +16,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include "../lxc/lxccontainer.h"
+#include <lxc/lxccontainer.h>
 
 #include <unistd.h>
 #include <signal.h>

diff --git a/src/tests/createtest.c b/src/tests/createtest.c
index 879d0a122a5af79b0d7be40be2bcfadbaa7df056..c018458b435515faf2d930d04a9aeb20ed9fca5b 100644 (file)
--- a/src/tests/createtest.c
+++ b/src/tests/createtest.c
@@ -16,7 +16,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include "../lxc/lxccontainer.h"
+#include <lxc/lxccontainer.h>
 
 #include <unistd.h>
 #include <signal.h>

diff --git a/src/tests/destroytest.c b/src/tests/destroytest.c
index 428d09ef1d30532c3116758c79f8a16a263ddb8f..6403472f32713f28ccf5c0903787913fdd91486f 100644 (file)
--- a/src/tests/destroytest.c
+++ b/src/tests/destroytest.c
@@ -16,7 +16,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include "../lxc/lxccontainer.h"
+#include <lxc/lxccontainer.h>
 
 #include <unistd.h>
 #include <signal.h>

diff --git a/src/tests/get_item.c b/src/tests/get_item.c
index c4c95cbd48bce4ac1dcaeb7999d895108f7a11de..9475130ad62c1182c5579240dada10cf26347af3 100644 (file)
--- a/src/tests/get_item.c
+++ b/src/tests/get_item.c
@@ -16,7 +16,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include "../lxc/lxccontainer.h"
+#include <lxc/lxccontainer.h>
 
 #include <unistd.h>
 #include <signal.h>

diff --git a/src/tests/getkeys.c b/src/tests/getkeys.c
index bab68830d59769edd7c1a93f3a4e82fb99f30cea..f90f009d62d8c69a378a6692032b5fe1167c23fa 100644 (file)
--- a/src/tests/getkeys.c
+++ b/src/tests/getkeys.c
@@ -16,7 +16,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include "../lxc/lxccontainer.h"
+#include <lxc/lxccontainer.h>
 
 #include <unistd.h>
 #include <signal.h>

diff --git a/src/tests/lxcpath.c b/src/tests/lxcpath.c
index a849a38e265d2600871edcdae49b4a3f75c0c6cc..9a51d76a93e4db10bc1d537947f47c3d133c657e 100644 (file)
--- a/src/tests/lxcpath.c
+++ b/src/tests/lxcpath.c
@@ -16,7 +16,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include "../lxc/lxccontainer.h"
+#include <lxc/lxccontainer.h>
 
 #include <unistd.h>
 #include <signal.h>

diff --git a/src/tests/saveconfig.c b/src/tests/saveconfig.c
index 649573f606f814b8971f328ed053162d2e3c21ad..a6eae650ad381f67108b35a05aaa2cff9fa624f5 100644 (file)
--- a/src/tests/saveconfig.c
+++ b/src/tests/saveconfig.c
@@ -16,7 +16,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include "../lxc/lxccontainer.h"
+#include <lxc/lxccontainer.h>
 
 #include <unistd.h>
 #include <signal.h>

diff --git a/src/tests/shutdowntest.c b/src/tests/shutdowntest.c
index f67995e1d590326c1762ad7c5780ab9cc4ddb67e..c7070c16c5f3c81491193201018911adad78d118 100644 (file)
--- a/src/tests/shutdowntest.c
+++ b/src/tests/shutdowntest.c
@@ -17,7 +17,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include "../lxc/lxccontainer.h"
+#include <lxc/lxccontainer.h>
 
 #include <unistd.h>
 #include <signal.h>

diff --git a/src/tests/snapshot.c b/src/tests/snapshot.c
index 1bbd6b414a1892c19e7d62801c23fe30c9b3ec57..8f165486d800be45d4dc5d1e4ed574a1ddb33fcd 100644 (file)
--- a/src/tests/snapshot.c
+++ b/src/tests/snapshot.c
@@ -16,7 +16,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include "../lxc/lxccontainer.h"
+#include <lxc/lxccontainer.h>
 
 #include <errno.h>
 #include <stdlib.h>

diff --git a/src/tests/startone.c b/src/tests/startone.c
index d781e758b71503131a1ece588859cfe0cdec2623..31ef503033d3894c09daaabfd9530a31ceba8768 100644 (file)
--- a/src/tests/startone.c
+++ b/src/tests/startone.c
@@ -16,7 +16,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include "../lxc/lxccontainer.h"
+#include <lxc/lxccontainer.h>
 
 #include <unistd.h>
 #include <signal.h>