From: Pierre-Marc Fournier <pierre-marc.fournier@polymtl.ca>
Date: Mon, 30 Mar 2009 21:25:19 +0000 (-0400)
Subject: continue build system
X-Git-Tag: v0.1~246
X-Git-Url: http://git.lttng.org/?p=ust.git;a=commitdiff_plain;h=e0baa9906b1c443228605a2b29c37b4bc004c61c

continue build system
---

diff --git a/Makefile.am b/Makefile.am
index f1ccfcf..f8620df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1 @@
-SUBDIRS = libmarkers libtracectl libtracing
+SUBDIRS = libmarkers libtracectl libtracing hello libmallocwrap
diff --git a/bootstrap b/bootstrap
index ad7f664..1199ae2 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,5 +1,9 @@
 #! /bin/sh
 
-aclocal \
-&& automake --gnu --add-missing \
-&& autoconf
+set -x
+aclocal -I config
+libtoolize --force --copy
+autoheader
+automake --add-missing --copy
+autoconf
+
diff --git a/configure.ac b/configure.ac
index c44b565..454faac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,5 +63,5 @@ AC_SUBST(KCOMPAT_PATH)
 #                 ust/Makefile
 #                 ustd/Makefile])
 
-AC_CONFIG_FILES([Makefile libmarkers/Makefile libtracectl/Makefile libtracing/Makefile])
+AC_CONFIG_FILES([Makefile libmarkers/Makefile libtracectl/Makefile libtracing/Makefile hello/Makefile libmallocwrap/Makefile])
 AC_OUTPUT
diff --git a/hello/Makefile.am b/hello/Makefile.am
index 3c96bee..81b4604 100644
--- a/hello/Makefile.am
+++ b/hello/Makefile.am
@@ -1,7 +1,11 @@
-lib_LTLIBRARIES = libmarkers.la
-libmarkers_la_SOURCES = marker.c tracepoint.c immediate.h jhash.h rcupdate.h marker.h tracepoint.h
+bin_PROGRAMS = hello
+hello_SOURCES = hello.c tp.c tp.h $(top_builddir)/share/kref.c
+hello_LDADD = $(top_builddir)/libmarkers/libmarkers.la $(top_builddir)/libtracectl/libtracectl.la $(top_builddir)/libtracing/libtracing.la @URCU_PATH@/liburcu.so
+##hello_LDFLAGS = -L$(top_builddir)/libmarkers
 
 INCLUDES = -I$(top_builddir)/share
 INCLUDES += -I@URCU_PATH@
 INCLUDES += -I@KCOMPAT_PATH@
 INCLUDES += -I$(top_builddir)/libtracing
+INCLUDES += -I$(top_builddir)/libmarkers
+INCLUDES += -I$(top_builddir)/libtracectl
diff --git a/libmallocwrap/Makefile b/libmallocwrap/Makefile
deleted file mode 100644
index 834d324..0000000
--- a/libmallocwrap/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-all: libmallocwrap.so
-
-libmallocwrap.so: mallocwrap.c
-	gcc -shared -fPIC -g -I../share -I../libmarkers -I../libtracing -I../libtracectl -L../libmarkers -L../libtracing -L../libtracectl $(CFLAGS) -ldl -lmarkers -ltracectl -ltracing -o libmallocwrap.so mallocwrap.c
-
-.PHONY: libmallocwrap.so
diff --git a/libmallocwrap/run b/libmallocwrap/run
index da398d3..7dd6b29 100644
--- a/libmallocwrap/run
+++ b/libmallocwrap/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-LD_VERBOSE=1 LD_LIBRARY_PATH=.:../libtracing:../libmarkers:../libtracectl LD_PRELOAD=libmallocwrap.so $1
+LD_VERBOSE=1 LD_LIBRARY_PATH=.:../libtracing/.libs:../libmarkers/.libs:../libtracectl/.libs LD_PRELOAD=libmallocwrap.so $1
diff --git a/libmarkers/Makefile.am b/libmarkers/Makefile.am
index 3c96bee..88643f3 100644
--- a/libmarkers/Makefile.am
+++ b/libmarkers/Makefile.am
@@ -1,5 +1,6 @@
 lib_LTLIBRARIES = libmarkers.la
 libmarkers_la_SOURCES = marker.c tracepoint.c immediate.h jhash.h rcupdate.h marker.h tracepoint.h
+libmarkers_la_LIBADD = @URCU_PATH@/liburcu.so
 
 INCLUDES = -I$(top_builddir)/share
 INCLUDES += -I@URCU_PATH@