X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt-usertrace%2FMakefile;h=06e336ea0ce4842b93dc2bc24adb3ee48f6f06e0;hb=ec7a5af61127aa50a1839eee5be99ce53494c57b;hp=c7ca3cf56d1dc6d0bbab627b86778e5ddd8673c3;hpb=bf4fbe437b427389f69eee6163979fa61fb6bbc7;p=lttv.git

diff --git a/ltt-usertrace/Makefile b/ltt-usertrace/Makefile
index c7ca3cf5..06e336ea 100644
--- a/ltt-usertrace/Makefile
+++ b/ltt-usertrace/Makefile
@@ -1,10 +1,11 @@
 
 CC=gcc
-INCLUDE_DIR=/usr/include
+INCLUDE_DIR?=/usr/include
 LIB_DIR?=/usr/lib
 RANLIB=ranlib
 
-LTT_CFLAGS=-I. -O2 -L.
+LTT_CFLAGS=-I. -O2 -L. -fPIC
+# note : x86_64 needs -fPIC ? FIXME
 
 #For testing lib ltt-usertrace-fast
 #CFLAGS+=-DLTT_SUBBUF_SIZE_CPU=134217728
@@ -15,34 +16,37 @@ all: libs samples
 #SAMPLE PROGRAMS
 
 samples: sample sample-highspeed sample-printf \
-	sample-instrument-fct sample-thread-slow sample-thread-fast sample-thread-brand
+	sample-instrument-fct sample-thread-slow sample-thread-fast sample-thread-brand sample-block
 
-sample: sample.c ltt-facility-loader-user_generic.c
-	$(CC) $(LTT_CFLAGS) $(CFLAGS) -o $@ $^
-	
-sample-thread-brand: sample-thread-brand.c ltt-facility-loader-user_generic.c
-	$(CC) $(LTT_CFLAGS) $(CFLAGS) -o $@ $^
+sample: sample.c
+	$(CC) $(LTT_CFLAGS) $(CFLAGS) -lltt-loader-user_generic -o $@ $^
+sample-block: sample-block.c
+	$(CC) $(LTT_CFLAGS) $(CFLAGS) -lltt-loader-user_generic -o $@ $^
 
-sample-highspeed: sample-highspeed.c ltt-facility-loader-user_generic.c
-	$(CC) $(LTT_CFLAGS) $(CFLAGS) -lltt-usertrace-fast -o $@ $^
+sample-thread-brand: sample-thread-brand.c
+	$(CC) $(LTT_CFLAGS) $(CFLAGS) -lltt-loader-user_generic -o $@ $^
 
-sample-printf: sample-printf.c ltt-facility-loader-user_generic.c
-	$(CC) $(LTT_CFLAGS) $(CFLAGS) -o $@ $^
+sample-highspeed: sample-highspeed.c
+	$(CC) $(LTT_CFLAGS) $(CFLAGS) -lltt-usertrace-fast -lltt-loader-user_generic -o $@ $^
+
+sample-printf: sample-printf.c
+	$(CC) $(LTT_CFLAGS) $(CFLAGS) -lltt-loader-user_generic -o $@ $^
 
 sample-instrument-fct: sample-instrument-fct.c
 	$(CC) $(LTT_CFLAGS) $(CFLAGS) -g -finstrument-functions -lltt-instrument-functions -o $@ $^
 
-sample-thread-slow: sample-thread-slow.c ltt-facility-loader-user_generic.c
-	$(CC) $(LTT_CFLAGS) $(CFLAGS) -lpthread -o $@ $^
+sample-thread-slow: sample-thread-slow.c
+	$(CC) $(LTT_CFLAGS) $(CFLAGS) -lpthread -lltt-loader-user_generic -o $@ $^
 
-sample-thread-fast: sample-thread-fast.c ltt-facility-loader-user_generic.c
-	$(CC) $(LTT_CFLAGS) $(CFLAGS) -lpthread -lltt-usertrace-fast -o $@ $^
+sample-thread-fast: sample-thread-fast.c
+	$(CC) $(LTT_CFLAGS) $(CFLAGS) -lpthread -lltt-usertrace-fast -lltt-loader-user_generic -o $@ $^
 
 
 #LIBRAIRIES
 
 libs: libltt-instrument-functions.a libltt-instrument-functions.so.0 \
-				libltt-usertrace-fast.a libltt-usertrace-fast.so.0
+				libltt-usertrace-fast.a libltt-usertrace-fast.so.0 \
+				libltt-loader-user_generic.a libltt-loader-user_generic.so.0
 
 libltt-usertrace-fast.a: ltt-usertrace-fast.o
 	@rm -f libltt-usertrace-fast.a
@@ -64,6 +68,16 @@ libltt-instrument-functions.so.0: ltt-instrument-functions.o ltt-facility-loader
 	$(CC) $(LTT_CFLAGS) $(CFLAGS) -lpthread -shared -Wl,-soname,libltt-instrument-functions.so -o $@ $^
 	ln -s libltt-instrument-functions.so.0 libltt-instrument-functions.so
 
+libltt-loader-user_generic.a: ltt-facility-loader-user_generic.o
+	@rm -f libltt-loader-user_generic.a
+	$(AR) rc $@ $^
+	$(RANLIB) $@
+
+libltt-loader-user_generic.so.0: ltt-facility-loader-user_generic.o
+	@rm -f libltt-loader-user_generic.so libltt-loader-user_generic.so.0
+	$(CC) $(LTT_CFLAGS) $(CFLAGS) -lpthread -shared -Wl,-soname,libltt-loader-user_generic.so -o $@ $^
+	ln -s libltt-loader-user_generic.so.0 libltt-loader-user_generic.so
+
 %.o: %.c
 	$(CC) $(LTT_CFLAGS) $(CFLAGS) -c -o $@ $+
 
@@ -76,9 +90,9 @@ install_headers:
 install_libs:
 	cp -df libltt-instrument-functions.so* libltt-instrument-functions.a $(LIB_DIR)
 	cp -df libltt-usertrace-fast.so* libltt-usertrace-fast.a $(LIB_DIR)
+	cp -df libltt-loader-user_generic.so* libltt-loader-user_generic.a $(LIB_DIR)
 
 install: install_headers libs install_libs
 
 clean:
-	rm -fr *.o *~ sample-thread sample sample-highspeed sample-printf sample-instrument-fct libltt-instrument-functions.so* libltt-instrument-functions.a libltt-usertrace-fast.a libltt-usertrace-fast.so* sample-thread-slow sample-thread-fast sample-thread-brand
-
+	find . -name \*~ | xargs rm -fr *.o sample-thread sample sample-highspeed sample-printf sample-instrument-fct libltt-instrument-functions.so* libltt-instrument-functions.a libltt-usertrace-fast.a libltt-usertrace-fast.so* libltt-loader-user_generic.so* libltt-loader-user_generic.a sample-thread-slow sample-thread-fast sample-thread-brand sample-block java/*.class java/Sample.h java/TestBrand.h