From 41ba580690b344ef9c4bbcdf2be9cd5668ccc305 Mon Sep 17 00:00:00 2001 From: Pierre-Marc Fournier Date: Tue, 27 Oct 2009 19:52:50 -0400 Subject: [PATCH] fix build and out of tree build --- include/Makefile.am | 2 +- java/Makefile.am | 6 +++--- libinterfork/Makefile.am | 2 +- libmallocwrap/Makefile.am | 2 +- libust/Makefile.am | 2 +- tests/basic/Makefile.am | 2 +- tests/basic_long/Makefile.am | 2 +- tests/fork/Makefile.am | 2 +- tests/hello/Makefile.am | 2 +- tests/hello2/Makefile.am | 2 +- ustctl/Makefile.am | 6 +++--- ustd/Makefile.am | 6 +++--- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/Makefile.am b/include/Makefile.am index 48a898b6..84c0b5f3 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,4 +1,4 @@ nobase_include_HEADERS = ust/immediate.h ust/kernelcompat.h ust/marker.h \ - ust/tracepoint.h + ust/tracepoint.h ust/processor.h noinst_HEADERS = share.h usterr.h diff --git a/java/Makefile.am b/java/Makefile.am index 82199f98..4dcb0c3a 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -1,8 +1,8 @@ -AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/libust +AM_CPPFLAGS = -I$(top_srcdir)/include lib_LTLIBRARIES = libustjava.la libustjava_la_SOURCES = UST.c UST.h -noinst_DATA = UST.java +dist_noinst_DATA = UST.java libustjava_la_LIBADD = -lc -L$(top_builddir)/libust/.libs -lust all: UST.class UST.h @@ -11,7 +11,7 @@ clean-local: rm -rf UST.h UST.class UST.class: UST.java - javac UST.java + javac -d "$(builddir)" "$(srcdir)/UST.java" UST.h: javah -jni UST diff --git a/libinterfork/Makefile.am b/libinterfork/Makefile.am index 6540103b..7a302bd4 100644 --- a/libinterfork/Makefile.am +++ b/libinterfork/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include lib_LTLIBRARIES = libinterfork.la libinterfork_la_SOURCES = interfork.c diff --git a/libmallocwrap/Makefile.am b/libmallocwrap/Makefile.am index 23b7004e..a98fe351 100644 --- a/libmallocwrap/Makefile.am +++ b/libmallocwrap/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include lib_LTLIBRARIES = libmallocwrap.la libmallocwrap_la_SOURCES = mallocwrap.c diff --git a/libust/Makefile.am b/libust/Makefile.am index 9ee3c9a2..6d99d0d5 100644 --- a/libust/Makefile.am +++ b/libust/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/libustcomm +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libustcomm lib_LTLIBRARIES = libust.la libust_la_SOURCES = buffer.h marker.c tracepoint.c 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 diff --git a/tests/basic/Makefile.am b/tests/basic/Makefile.am index 4945cdf1..4915f13a 100644 --- a/tests/basic/Makefile.am +++ b/tests/basic/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include noinst_PROGRAMS = basic basic_SOURCES = basic.c diff --git a/tests/basic_long/Makefile.am b/tests/basic_long/Makefile.am index 00b5ec61..9f80a10d 100644 --- a/tests/basic_long/Makefile.am +++ b/tests/basic_long/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include noinst_PROGRAMS = basic_long basic_long_SOURCES = basic_long.c diff --git a/tests/fork/Makefile.am b/tests/fork/Makefile.am index 7bbef71d..79fe085e 100644 --- a/tests/fork/Makefile.am +++ b/tests/fork/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include noinst_PROGRAMS = fork fork2 fork_SOURCES = fork.c diff --git a/tests/hello/Makefile.am b/tests/hello/Makefile.am index ce0ad2fe..e1046d20 100644 --- a/tests/hello/Makefile.am +++ b/tests/hello/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include noinst_PROGRAMS = hello hello_SOURCES = hello.c tp.c tp.h diff --git a/tests/hello2/Makefile.am b/tests/hello2/Makefile.am index e06d5059..2a09dbe2 100644 --- a/tests/hello2/Makefile.am +++ b/tests/hello2/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include noinst_PROGRAMS = hello2 hello2_SOURCES = hello2.c diff --git a/ustctl/Makefile.am b/ustctl/Makefile.am index 93c5629c..380405b2 100644 --- a/ustctl/Makefile.am +++ b/ustctl/Makefile.am @@ -1,7 +1,7 @@ -AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/libustcomm \ - -I$(top_builddir)/libustcmd $(KCOMPAT_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libustcomm \ + -I$(top_srcdir)/libustcmd $(KCOMPAT_CFLAGS) bin_PROGRAMS = ustctl -ustctl_SOURCES = ustctl.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h $(top_builddir)/libustcmd/ustcmd.c $(top_builddir)/libustcmd/ustcmd.h +ustctl_SOURCES = ustctl.c $(top_srcdir)/libustcomm/ustcomm.c $(top_srcdir)/libustcomm/ustcomm.h $(top_srcdir)/libustcmd/ustcmd.c $(top_srcdir)/libustcmd/ustcmd.h ustctl_CFLAGS = -DUST_COMPONENT=ustctl diff --git a/ustd/Makefile.am b/ustd/Makefile.am index 8c8fe647..c4b15672 100644 --- a/ustd/Makefile.am +++ b/ustd/Makefile.am @@ -1,7 +1,7 @@ -AM_CPPFLAGS = -I$(top_builddir)/libust -I$(top_builddir)/libustcomm \ - -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/libust -I$(top_srcdir)/libustcomm \ + -I$(top_srcdir)/include bin_PROGRAMS = ustd -ustd_SOURCES = lowlevel.c ustd.c ustd.h $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h +ustd_SOURCES = lowlevel.c ustd.c ustd.h $(top_srcdir)/libustcomm/ustcomm.c $(top_srcdir)/libustcomm/ustcomm.h ustd_LDFLAGS = -lpthread ustd_CFLAGS = -DUST_COMPONENT=ustd -- 2.34.1