From: Pierre-Marc Fournier <pierre-marc.fournier@polymtl.ca>
Date: Mon, 30 Mar 2009 20:13:40 +0000 (-0400)
Subject: continue work on build system
X-Git-Tag: v1.9.1~1023
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=7a7dca403897749bd9517dbb94cfc144adfd64f9;p=lttng-ust.git

continue work on build system
---

diff --git a/Makefile.am b/Makefile.am
index 2cab9628..f1ccfcf1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1 @@
-SUBDIRS = libmarkers
+SUBDIRS = libmarkers libtracectl libtracing
diff --git a/configure.ac b/configure.ac
index 6da50cc2..c44b5655 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])
+AC_CONFIG_FILES([Makefile libmarkers/Makefile libtracectl/Makefile libtracing/Makefile])
 AC_OUTPUT
diff --git a/hello/Makefile b/hello/Makefile
deleted file mode 100644
index 8b7e4084..00000000
--- a/hello/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-all: hello
-
-hello: hello.c
-#dynamic version
-	gcc -g -I../libmarkers -I../share -I../libtracing -L../libmarkers -lmarkers -L../libtracectl -ltracectl -L../libtracing -ltracing $(CFLAGS) -Wl,-rpath ../../../../urcu -o hello hello.c tp.c
-	# -Wl,--print-map
-
-clean:
-	rm -rf hello *.o
-
-.PHONY: all hello clean
diff --git a/hello/Makefile.am b/hello/Makefile.am
new file mode 100644
index 00000000..3c96bee3
--- /dev/null
+++ b/hello/Makefile.am
@@ -0,0 +1,7 @@
+lib_LTLIBRARIES = libmarkers.la
+libmarkers_la_SOURCES = marker.c tracepoint.c immediate.h jhash.h rcupdate.h marker.h tracepoint.h
+
+INCLUDES = -I$(top_builddir)/share
+INCLUDES += -I@URCU_PATH@
+INCLUDES += -I@KCOMPAT_PATH@
+INCLUDES += -I$(top_builddir)/libtracing
diff --git a/libtracectl/Makefile b/libtracectl/Makefile
deleted file mode 100644
index acbfbead..00000000
--- a/libtracectl/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-all: libtracectl.so
-
-libtracectl.so: tracectl.c
-	gcc -g -shared -fPIC -I../libmarkers -I../libtracing -I../share -I../libustcomm -I. $(CFLAGS) -o libtracectl.so tracectl.c marker-control.c ../share/usterr.c ../libustcomm/ustcomm.c
-
-clean:
-	rm -rf *.so *.o
-
-.PHONY: libtracectl.so
diff --git a/libtracing/Makefile b/libtracing/Makefile
deleted file mode 100644
index d8abbbbe..00000000
--- a/libtracing/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-all: libtracing.so
-
-libtracing.so: *.c *.h
-	gcc -g -fPIC -I../share -I../libtracing -I../libmarkers $(CFLAGS) -shared -o libtracing.so *.c
-
-.PHONY: libtracing.so all