update make system

diff --git a/Makefile.am b/Makefile.am
index 65809787655bac398266a17111bd9606cbcb8b45..2d6c23b6653f64c2b470dfaaa8566b85cc82247c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,3 +2,4 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = libust tests libmallocwrap ustd ust libinterfork
 
 EXTRA_DIST = share/kernelcompat.h doc
+bin_SCRIPTS = usttrace

diff --git a/configure.ac b/configure.ac
index 500765b74efc1244ee9c4627702cf9773c935d30..88266f5a4ade2e34faf7ab63692d38a7561efc8d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -83,6 +83,7 @@ AC_CONFIG_FILES([
        tests/hello2/Makefile
        tests/basic/Makefile
        tests/basic_long/Makefile
+       tests/fork/Makefile
        libmallocwrap/Makefile
        libinterfork/Makefile
        ustd/Makefile

diff --git a/libust/Makefile.am b/libust/Makefile.am
index 1f18f8b90adc396f614ff8f442a89e3ba8b0d3eb..df5f46a4228247a68b594a813e4841a860259844 100644 (file)
--- a/libust/Makefile.am
+++ b/libust/Makefile.am
@@ -2,7 +2,7 @@ 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.h localerr.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.h
 libust_la_LDFLAGS = -no-undefined -version-info 0:0:0
 libust_la_LIBADD = $(URCU_LIBS) -lpthread
 libust_la_CFLAGS = -DUST_COMPONENT="libust"

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 644b80f11a74970456c605552fe4d46856f62364..1da989f683711cdebc5f13e2212a172ee067ba55 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1 +1 @@
-SUBDIRS = hello hello2 basic basic_long
+SUBDIRS = hello hello2 basic basic_long fork

diff --git a/ust/Makefile.am b/ust/Makefile.am
index f6a6e9c410332b8af8bd3caa2a45a9f1ec62273d..dcd23a841c8e87b23aa8821f68e65ffc4a9782fb 100644 (file)
--- 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 $(top_builddir)/libustcmd/ustcmd.c $(top_builddir)/libustcmd/ustcmd.h localerr.h
+ust_SOURCES = ust.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h $(top_builddir)/libustcmd/ustcmd.c $(top_builddir)/libustcmd/ustcmd.h $(top_builddir)/share/usterr.h
 ust_CFLAGS = -DUST_COMPONENT=ust
 
 INCLUDES = $(KCOMPAT_CFLAGS)

diff --git a/ustd/Makefile.am b/ustd/Makefile.am
index 4aaa05fe2212e5cf5538f0e51d95c205e64c2598..e17854035243834a004e675ab90402201043cb87 100644 (file)
--- a/ustd/Makefile.am
+++ b/ustd/Makefile.am
@@ -2,6 +2,6 @@ INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust \
         -I$(top_builddir)/libustcomm $(KCOMPAT_CFLAGS)
 
 bin_PROGRAMS = ustd
-ustd_SOURCES = lowlevel.c localerr.h ustd.c ustd.h $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h
+ustd_SOURCES = lowlevel.c ustd.c ustd.h $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h $(top_builddir)/share/usterr.h
 ustd_LDFLAGS = -lpthread
 ustd_CFLAGS = -DUST_COMPONENT=ustd