change #include "jtag.h" to <jtag/jtag.h>

[fw/openocd] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 1f458372708fa62f8d05e7904967b9c88486f9dc..38eb57b0c76933151ef856a812eb91df87233ee6 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -29,9 +29,9 @@
 #endif
 
 #include "openocd.h"
-#include "jtag.h"
-#include "ioutil.h"
-#include "configuration.h"
+#include <jtag/jtag.h>
+#include <helper/ioutil.h>
+#include <helper/configuration.h>
 #include "xsvf.h"
 #include "svf.h"
 #include "nand.h"
@@ -244,10 +244,8 @@ int openocd_main(int argc, char *argv[])
        if (ret != ERROR_OK)
                return EXIT_FAILURE;
 
-#if BUILD_HTTPD
        if (httpd_start(cmd_ctx) != ERROR_OK)
                return EXIT_FAILURE;
-#endif
 
        ret = server_init(cmd_ctx);
        if (ERROR_OK != ret)
@@ -266,9 +264,7 @@ int openocd_main(int argc, char *argv[])
 
        server_quit();
 
-#if BUILD_HTTPD
        httpd_stop();
-#endif
 
        unregister_all_commands(cmd_ctx, NULL);