From 01377ba5ec3460a6886f3a16e52f7f956c8fb100 Mon Sep 17 00:00:00 2001 From: Pierre-Marc Fournier Date: Thu, 10 Sep 2009 12:50:44 -0400 Subject: [PATCH] update make system --- Makefile.am | 1 + configure.ac | 1 + libust/Makefile.am | 2 +- tests/Makefile.am | 2 +- ust/Makefile.am | 2 +- ustd/Makefile.am | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6580978..2d6c23b 100644 --- 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 500765b..88266f5 100644 --- 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 1f18f8b..df5f46a 100644 --- 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 644b80f..1da989f 100644 --- 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 f6a6e9c..dcd23a8 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 $(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 4aaa05f..e178540 100644 --- 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 -- 2.34.1