Fix build system for valid make dist

[lttng-tools.git] / lttng / commands / disable_channels.c

diff --git a/lttng/commands/disable_channels.c b/lttng/commands/disable_channels.c
index 4235fbf86f56b1724acfb5fd99f0c8cbee2985a6..c23019b45fc67d430e40f87602031526e48c0b61 100644 (file)
--- a/lttng/commands/disable_channels.c
+++ b/lttng/commands/disable_channels.c
@@ -3,8 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,9 +25,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "cmd.h"
-#include "conf.h"
-#include "utils.h"
+#include "../cmd.h"
+#include "../conf.h"
+#include "../utils.h"
 
 static char *opt_channels;
 static char *opt_kernel;
@@ -77,19 +77,24 @@ static int disable_channels(void)
 {
        int ret = CMD_SUCCESS;
        char *channel_name;
+       struct lttng_domain dom;
 
        if (set_session_name(opt_session_name) < 0) {
                ret = CMD_ERROR;
                goto error;
        }
 
+       if (opt_kernel) {
+               dom.type = LTTNG_DOMAIN_KERNEL;
+       }
+
        /* Strip channel list */
        channel_name = strtok(opt_channels, ",");
        while (channel_name != NULL) {
                /* Kernel tracer action */
                if (opt_kernel) {
                        DBG("Disabling kernel channel %s", channel_name);
-                       ret = lttng_kernel_disable_channel(channel_name);
+                       ret = lttng_disable_channel(&dom, channel_name);
                        if (ret < 0) {
                                goto error;
                        } else {