X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt-usertrace%2FMakefile;h=93748564f4e099968ce8a1d29a3c5ab6a0e1e684;hb=cc00914443891e8a5a3de946baeea24e724a818e;hp=baf12fcb32fda5bb5725965ab0341f6c9690a0e5;hpb=403a4bcd56275d42688414fc29dc540da2279c07;p=lttv.git

diff --git a/ltt-usertrace/Makefile b/ltt-usertrace/Makefile
index baf12fcb..93748564 100644
--- a/ltt-usertrace/Makefile
+++ b/ltt-usertrace/Makefile
@@ -1,10 +1,11 @@
 
 CC=gcc
 INCLUDE_DIR=/usr/include
-LIB_DIR=/usr/lib
+LIB_DIR?=/usr/lib
 RANLIB=ranlib
 
-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,31 +16,37 @@ all: libs samples
 #SAMPLE PROGRAMS
 
 samples: sample sample-highspeed sample-printf \
-				sample-instrument-fct sample-thread-slow sample-thread-fast
+	sample-instrument-fct sample-thread-slow sample-thread-fast sample-thread-brand sample-block
 
-sample: sample.c ltt-facility-loader-user_generic.c
-	$(CC) $(CFLAGS) -o $@ $^
-	
-sample-highspeed: sample-highspeed.c ltt-facility-loader-user_generic.c
-	$(CC) $(CFLAGS) -lltt-usertrace-fast -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-printf: sample-printf.c ltt-facility-loader-user_generic.c
-	$(CC) $(CFLAGS) -o $@ $^
+sample-thread-brand: sample-thread-brand.c
+	$(CC) $(LTT_CFLAGS) $(CFLAGS) -lltt-loader-user_generic -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) $(CFLAGS) -g -finstrument-functions -lltt-instrument-functions -o $@ $^
+	$(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) $(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) $(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
@@ -48,7 +55,7 @@ libltt-usertrace-fast.a: ltt-usertrace-fast.o
 
 libltt-usertrace-fast.so.0: ltt-usertrace-fast.o
 	@rm -f libltt-usertrace-fast.so libltt-usertrace-fast.so.0
-	$(CC) $(CFLAGS) -lpthread -shared -Wl,-soname,libltt-usertrace-fast.so -o $@ $^
+	$(CC) $(LTT_CFLAGS) $(CFLAGS) -lpthread -shared -Wl,-soname,libltt-usertrace-fast.so -o $@ $^
 	ln -s libltt-usertrace-fast.so.0 libltt-usertrace-fast.so
 
 libltt-instrument-functions.a: ltt-instrument-functions.o ltt-facility-loader-user_generic.o ltt-usertrace-fast.o
@@ -58,17 +65,34 @@ libltt-instrument-functions.a: ltt-instrument-functions.o ltt-facility-loader-us
 
 libltt-instrument-functions.so.0: ltt-instrument-functions.o ltt-facility-loader-user_generic.o ltt-usertrace-fast.o
 	@rm -f libltt-instrument-functions.so libltt-instrument-functions.so.0
-	$(CC) $(CFLAGS) -lpthread -shared -Wl,-soname,libltt-instrument-functions.so -o $@ $^
+	$(CC) $(LTT_CFLAGS) $(CFLAGS) -lpthread -shared -Wl,-soname,libltt-instrument-functions.so -o $@ $^
 	ln -s libltt-instrument-functions.so.0 libltt-instrument-functions.so
 
-.PHONY : clean install libs samples
+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
 
-install:
+%.o: %.c
+	$(CC) $(LTT_CFLAGS) $(CFLAGS) -c -o $@ $+
+
+.PHONY : clean install libs install_libs install_headers samples
+
+install_headers:
 	if [ ! -e "$(INCLUDE_DIR)/ltt" ] ; then mkdir $(INCLUDE_DIR)/ltt ; fi
 	cp -f ltt/*.h $(INCLUDE_DIR)/ltt
+
+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)
 
-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
+install: install_headers libs install_libs
 
+clean:
+	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