continue work on build system

diff --git a/Makefile.am b/Makefile.am
index 2cab9628eb2df33a43b990ab34c4bfab984260d8..f1ccfcf1497d8411b83bff40f9f90ea179a34040 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1 @@
-SUBDIRS = libmarkers
+SUBDIRS = libmarkers libtracectl libtracing

diff --git a/configure.ac b/configure.ac
index 6da50cc29a59725b027c03b646a1c43422d9457c..c44b5655666e4f01cf0d693c27e20064897da3ee 100644 (file)
--- 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 (file)
index 8b7e408..0000000
--- 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 (file)
index 0000000..3c96bee
--- /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 (file)
index acbfbea..0000000
--- 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 (file)
index d8abbbb..0000000
--- 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