fix build and out of tree build

diff --git a/include/Makefile.am b/include/Makefile.am
index 48a898b67ce330bd8a67a8d65d55c6e739e5311a..84c0b5f3cff66d4e60dbdc3fd438b729d597cb42 100644 (file)
--- 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 82199f98783ac1530c4ffe9c80dec801d9b3a422..4dcb0c3aff20b315b4a0164578238fe2554b9af9 100644 (file)
--- 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 6540103badc7990f0cd0ea1502a69925f1654043..7a302bd4c8f21292d6528c3dda8b6837aa8525cc 100644 (file)
--- 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 23b7004e6219e5acb772b59bb31f787fba4fb45c..a98fe351ff7856f5deddd9592b1015cf0d02d11a 100644 (file)
--- 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 9ee3c9a21d2dee898b4599df9fdbd9f1eca3eaa5..6d99d0d5d01b8b7f3ccd4743efcf48e78cc2bf2a 100644 (file)
--- 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 4945cdf15764254bcdb3ccc84dfe3b5a77daf234..4915f13a558e272f98909115f440a9771c8ae66b 100644 (file)
--- 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 00b5ec618a40d98a3e75d08afd92728be65cda93..9f80a10d97b6170c57eb4778ffb28bd8e494bffd 100644 (file)
--- 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 7bbef71d5b2699b6adab4ff7264a2b3dff472907..79fe085ebe3c4c736b3db16fedffa1e2f842792b 100644 (file)
--- 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 ce0ad2fe86d1af397482f6cb9bfabe42650ca17d..e1046d201ec113e2fb7e6705b46061ce3ba8bad9 100644 (file)
--- 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 e06d50592c8539b7ec4c29298ca1d22063906e13..2a09dbe28ffde7965f209a956a32ccb0528fb79c 100644 (file)
--- 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 93c5629c98b5a7c501a0c4ec69fbfcf5f38c9e43..380405b250dac6debcb09bbdc26dec634636e67d 100644 (file)
--- 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 8c8fe647ab328b67d06069c39df1a1e86c9d9cae..c4b156723b045e377f36f425f797bdfa072a4af9 100644 (file)
--- 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