Fix build system for valid make dist

Signed-off-by: David Goulet <david.goulet@polymtl.ca>

diff --git a/Makefile.am b/Makefile.am
index fe1c45cef59d4176d4768408a513a466585a342a..3d86d6e66f238ff51569f22c6f3d1f90e213b25d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,4 +9,5 @@ SUBDIRS = liblttsessiondcomm \
                  lttng \
                  ltt-kconsumerd \
                  ltt-sessiond \
-                 tests
+                 tests \
+                 include

diff --git a/configure.ac b/configure.ac
index fdc8b6ff568cb9e952c9c4b8b57b2d35d05c29e0..2661173833b5fef62456ac2066b06ff9b9258137 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,9 @@
-AC_INIT([lttng-tools], [0.0.1], [david.goulet@polymtl.ca], [http://lttng.org])
+AC_INIT([lttng-tools], [0.0.1], [david.goulet@polymtl.ca], ,[http://lttng.org])
 AC_CONFIG_AUX_DIR([config])
+AC_CANONICAL_TARGET
+AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([config])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign])
 AM_SILENT_RULES([yes])
 
 AC_CHECK_HEADERS([ \
@@ -25,11 +27,18 @@ AC_CHECK_DECL([cds_list_add], [],
        [AC_MSG_ERROR([liburcu 0.5.4 or newer is needed])], [[#include <urcu/list.h>]]
 )
 
-CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
-
 AC_PROG_CC
 AC_PROG_LIBTOOL
 
+CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
+
+DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir)"
+
+lttngincludedir="${includedir}/lttng"
+
+AC_SUBST(lttngincludedir)
+AC_SUBST(DEFAULT_INCLUDES)
+
 AC_CONFIG_FILES([
        Makefile
        include/Makefile

diff --git a/include/Makefile.am b/include/Makefile.am
index d30101f8eb729ca6c696c7fe4d75334c9623c3db..1f5dbd95c58376f4f478106bf1a57f7d9ca3a13d 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,3 +1,3 @@
-#nobase_include_HEADERS = lttng/lttng.h
+lttnginclude_HEADERS = lttng/lttng.h
 
 noinst_HEADERS = lttngerr.h lttng-kernel.h lttng-kconsumerd.h lttng-share.h

diff --git a/libkernelctl/Makefile.am b/libkernelctl/Makefile.am
index 62781eaccf1b921941315489c23df10db9502fb4..dac301d39cc23e021a75eaca32a5a169e117e894 100644 (file)
--- a/libkernelctl/Makefile.am
+++ b/libkernelctl/Makefile.am
@@ -2,4 +2,4 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 noinst_LTLIBRARIES = libkernelctl.la
 
-libkernelctl_la_SOURCES = libkernelctl.c
+libkernelctl_la_SOURCES = libkernelctl.c libkernelctl.h kernel-ioctl.h

diff --git a/liblttkconsumerd/Makefile.am b/liblttkconsumerd/Makefile.am
index 86967bed3dbc80208abb87bebad0f614994aaa37..5594ee03b42eeca995c38ce5f128622b727b460c 100644 (file)
--- a/liblttkconsumerd/Makefile.am
+++ b/liblttkconsumerd/Makefile.am
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/liblttkconsumerd -I$(top_s
 
 lib_LTLIBRARIES = liblttkconsumerd.la
 
-liblttkconsumerd_la_SOURCES = liblttkconsumerd.c
+liblttkconsumerd_la_SOURCES = liblttkconsumerd.c liblttkconsumerd.h
 
 liblttkconsumerd_la_LIBADD = \
                $(top_builddir)/libkernelctl/libkernelctl.la \

diff --git a/liblttsessiondcomm/Makefile.am b/liblttsessiondcomm/Makefile.am
index 8c0d83450c51f5e0b9c196946a6d48b787c95d85..24437c7bf1ad11a737683f35fd02ef4958694400 100644 (file)
--- a/liblttsessiondcomm/Makefile.am
+++ b/liblttsessiondcomm/Makefile.am
@@ -3,4 +3,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 noinst_LTLIBRARIES = liblttsessiondcomm.la
 
 liblttsessiondcomm_la_SOURCES = \
+                               liblttsessiondcomm.h \
                                liblttsessiondcomm.c

diff --git a/ltt-sessiond/Makefile.am b/ltt-sessiond/Makefile.am
index 6242325d0b739120873a209edc469bd7ccaa0982..13c272a24886d602dd9b92ea975ff3bc26dd61c2 100644 (file)
--- a/ltt-sessiond/Makefile.am
+++ b/ltt-sessiond/Makefile.am
@@ -5,7 +5,8 @@ AM_CFLAGS = -fno-strict-aliasing
 
 bin_PROGRAMS = ltt-sessiond
 
-ltt_sessiond_SOURCES = utils.c trace.c session.c traceable-app.c ust-ctl.c kernel-ctl.c main.c
+ltt_sessiond_SOURCES = utils.c trace.c session.c traceable-app.c ust-ctl.c kernel-ctl.c main.c \
+                       utils.h trace.h session.h traceable-app.h ust-ctl.h kernel-ctl.h ltt-sessiond.h
 
 ltt_sessiond_LDADD = \
                 $(top_builddir)/liblttsessiondcomm/liblttsessiondcomm.la \

diff --git a/lttng/Makefile.am b/lttng/Makefile.am
index 91cf32bfa5156c28531aa1656c2d82da4aec8bcf..7a828006b8a6955758678e263bddd1680886c9cc 100644 (file)
--- a/lttng/Makefile.am
+++ b/lttng/Makefile.am
@@ -2,13 +2,13 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 bin_PROGRAMS = lttng
 
-lttng_SOURCES = conf.c commands/start.c \
+lttng_SOURCES = cmd.h conf.c conf.h commands/start.c \
                                commands/list.c commands/create.c commands/destroy.c \
                                commands/stop.c commands/enable_events.c \
                                commands/disable_events.c commands/enable_channels.c \
                                commands/disable_channels.c commands/add_context.c \
                                commands/set_session.c commands/version.c \
-                               utils.c lttng.c
+                               utils.c utils.h lttng.c
 
 lttng_LDADD = \
                $(top_builddir)/liblttngctl/liblttngctl.la

diff --git a/lttng/commands/add_context.c b/lttng/commands/add_context.c
index 76620e74bfc486c45e898f63664a752a71d1e47e..edc8f37ac3724a488b1935c48ad4ff60eb892156 100644 (file)
--- a/lttng/commands/add_context.c
+++ b/lttng/commands/add_context.c
@@ -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_event_name;
 static char *opt_channel_name;

diff --git a/lttng/commands/create.c b/lttng/commands/create.c
index 22065e17f2b66660fe7393a75434f341fe5f0d5e..4eb9809c704d2f2a3ef517a0963a3a24c6854822 100644 (file)
--- a/lttng/commands/create.c
+++ b/lttng/commands/create.c
@@ -26,9 +26,9 @@
 #include <time.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_output_path;
 static char *opt_session_name;

diff --git a/lttng/commands/destroy.c b/lttng/commands/destroy.c
index 1eca989e6cdd6e826b28f452dd1bbdb1209073af..516f8ab9521a539c6ed109be40476640df6730df 100644 (file)
--- a/lttng/commands/destroy.c
+++ b/lttng/commands/destroy.c
@@ -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_session_name;
 

diff --git a/lttng/commands/disable_channels.c b/lttng/commands/disable_channels.c
index 655eb95d0e9e05b185e832877e911cf5a2d38e21..c23019b45fc67d430e40f87602031526e48c0b61 100644 (file)
--- a/lttng/commands/disable_channels.c
+++ b/lttng/commands/disable_channels.c
@@ -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;

diff --git a/lttng/commands/disable_events.c b/lttng/commands/disable_events.c
index ae3913f915bae999d66461fc326b70687d65b42c..952b2b65c7a9ae82b57c2ca9e1b695abec7d4e5e 100644 (file)
--- a/lttng/commands/disable_events.c
+++ b/lttng/commands/disable_events.c
@@ -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_event_list;
 static char *opt_kernel;

diff --git a/lttng/commands/enable_channels.c b/lttng/commands/enable_channels.c
index f149cc74584a122670673df6351f0636bc1f8e27..1878096bf511bef95c50ba45dfdae70ce8c22b66 100644 (file)
--- a/lttng/commands/enable_channels.c
+++ b/lttng/commands/enable_channels.c
@@ -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;

diff --git a/lttng/commands/enable_events.c b/lttng/commands/enable_events.c
index 3e35a6c38b42a7e585e64c316efd760d3a1c51fd..70caf6fbbedc9a846c67599530e471b7b35217e9 100644 (file)
--- a/lttng/commands/enable_events.c
+++ b/lttng/commands/enable_events.c
@@ -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_event_list;
 static int opt_event_type;

diff --git a/lttng/commands/list.c b/lttng/commands/list.c
index 241a0434549efe8891b9742845117664e2f0e874..52c44eeb652a73f638d0c8182426a62fdf84bbf6 100644 (file)
--- a/lttng/commands/list.c
+++ b/lttng/commands/list.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "cmd.h"
+#include "../cmd.h"
 
 static int opt_pid;
 static int opt_channels;

diff --git a/lttng/commands/set_session.c b/lttng/commands/set_session.c
index 86e81f513fa07667eac2b59849d98c06a6b92c4f..df0297f9fe99b84e04ddf57adfe808eaa5421d2b 100644 (file)
--- a/lttng/commands/set_session.c
+++ b/lttng/commands/set_session.c
@@ -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_session_name;
 

diff --git a/lttng/commands/start.c b/lttng/commands/start.c
index 710458b6c94f4775600b8e7f315977c59d2a627c..2eacc462ff464a2a464f9b9c79fc1260479ffad6 100644 (file)
--- a/lttng/commands/start.c
+++ b/lttng/commands/start.c
@@ -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_session_name;
 

diff --git a/lttng/commands/stop.c b/lttng/commands/stop.c
index c79a553d1b12c4d999226e265c592757a851719f..87862b4b905dcc049fd8c77703a9fd9693b02841 100644 (file)
--- a/lttng/commands/stop.c
+++ b/lttng/commands/stop.c
@@ -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_session_name;
 

diff --git a/lttng/commands/version.c b/lttng/commands/version.c
index 2fc86035f8eaf0eed5852ca96e5f96e670aa949d..7b8852308a047e96dad3a3de9c5b30251c1d75f6 100644 (file)
--- a/lttng/commands/version.c
+++ b/lttng/commands/version.c
@@ -25,9 +25,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "cmd.h"
-#include "conf.h"
-#include "utils.h"
+#include "../cmd.h"
 
 enum {
        OPT_HELP = 1,