From e14a34e05f6dd7b5f1133085561313ad90b8f266 Mon Sep 17 00:00:00 2001
From: Jan Blunck <jblunck@suse.de>
Date: Wed, 10 Jun 2009 20:07:20 +0200
Subject: [PATCH] Distribute all necessary files for building

Signed-off-by: Jan Blunck <jblunck@suse.de>
---
 Makefile.am               | 3 +++
 configure.ac              | 2 +-
 hello/Makefile.am         | 3 +++
 libmallocwrap/Makefile.am | 2 ++
 libust/Makefile.am        | 2 +-
 ust/Makefile.am           | 2 +-
 6 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 32390bf..99326af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,4 @@
+ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = libust hello libmallocwrap ustd ust
+
+EXTRA_DIST = share/kernelcompat.h doc
diff --git a/configure.ac b/configure.ac
index 006a903..8d4bfbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 AC_INIT([ust], [0.0], [pierre-marc dot fournier at polymtl dot ca])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([0.0 foreign])
+AM_INIT_AUTOMAKE([0.0 foreign dist-bzip2 no-dist-gzip])
 AC_CONFIG_SRCDIR([ust/ust.c])
 AC_CONFIG_HEADERS([config.h])
 
diff --git a/hello/Makefile.am b/hello/Makefile.am
index 85b04b6..845773e 100644
--- a/hello/Makefile.am
+++ b/hello/Makefile.am
@@ -4,3 +4,6 @@ INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust \
 noinst_PROGRAMS = hello
 hello_SOURCES = hello.c tp.c tp.h
 hello_LDADD = $(top_builddir)/libust/libust.la $(URCU_LIBS)
+
+noinst_SCRIPTS = run
+EXTRA_DIST = run
diff --git a/libmallocwrap/Makefile.am b/libmallocwrap/Makefile.am
index 3d49dcb..acc8556 100644
--- a/libmallocwrap/Makefile.am
+++ b/libmallocwrap/Makefile.am
@@ -4,4 +4,6 @@ INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust \
 lib_LTLIBRARIES = libmallocwrap.la
 libmallocwrap_la_SOURCES = mallocwrap.c
 libmallocwrap_la_LIBADD = -ldl
+
 noinst_SCRIPTS = run
+EXTRA_DIST = run
diff --git a/libust/Makefile.am b/libust/Makefile.am
index 1bc6110..6781064 100644
--- a/libust/Makefile.am
+++ b/libust/Makefile.am
@@ -2,6 +2,6 @@ INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libustcomm \
 	$(KCOMPAT_CFLAGS) $(URCU_CFLAGS)
 
 lib_LTLIBRARIES = libust.la
-libust_la_SOURCES = marker.c marker.h tracepoint.c tracepoint.h immediate.h channels.c channels.h marker-control.c marker-control.h relay.c relay.h tracer.c tracer.h tracercore.c tracercore.h serialize.c tracectl.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/share/usterr.c $(top_builddir)/share/usterr.h
+libust_la_SOURCES = marker.c marker.h tracepoint.c tracepoint.h immediate.h channels.c channels.h marker-control.c marker-control.h relay.c relay.h tracer.c tracer.h tracercore.c tracercore.h serialize.c tracectl.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/share/usterr.c $(top_builddir)/share/usterr.h localerr.h
 libust_la_LDFLAGS = -no-undefined -version-info 0:0:0
 libust_la_LIBADD = $(URCU_LIBS) -lpthread
diff --git a/ust/Makefile.am b/ust/Makefile.am
index 8f78cfd..55b8762 100644
--- a/ust/Makefile.am
+++ b/ust/Makefile.am
@@ -1,5 +1,5 @@
 bin_PROGRAMS = ust
-ust_SOURCES = ust.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h
+ust_SOURCES = ust.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h localerr.h
 
 #INCLUDES = -I$(top_builddir)/share
 #INCLUDES += -I@URCU_PATH@
-- 
2.34.1