X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt-usertrace%2FMakefile;h=dad7049cdf43a7f0da32c693c78f0c69da82f55f;hb=a31c6b45ecaaa09fe220f4f89ca12e8ab7a16600;hp=c3daad73f734f03723968dd6c55a2dfb68475609;hpb=1a7c8c1941805d1ef8f7121516028537fff1b397;p=lttv.git

diff --git a/ltt-usertrace/Makefile b/ltt-usertrace/Makefile
index c3daad73..dad7049c 100644
--- a/ltt-usertrace/Makefile
+++ b/ltt-usertrace/Makefile
@@ -1,11 +1,10 @@
 
 CC=gcc
 INCLUDE_DIR=/usr/include
-LIB_DIR=/usr/lib
+LIB_DIR?=/usr/lib
 RANLIB=ranlib
 
-CFLAGS=-I. -O3
-LDFLAGS=-L.
+LTT_CFLAGS=-I. -O2 -L.
 
 #For testing lib ltt-usertrace-fast
 #CFLAGS+=-DLTT_SUBBUF_SIZE_CPU=134217728
@@ -16,25 +15,28 @@ 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: sample.c ltt-facility-loader-user_generic.c
-	$(CC) $(CFLAGS) -o $@ $^
+	$(CC) $(LTT_CFLAGS) $(CFLAGS) -o $@ $^
 	
+sample-thread-brand: sample-thread-brand.c ltt-facility-loader-user_generic.c
+	$(CC) $(LTT_CFLAGS) $(CFLAGS) -o $@ $^
+
 sample-highspeed: sample-highspeed.c ltt-facility-loader-user_generic.c
-	$(CC) $(CFLAGS) -L. -lltt-usertrace-fast -o $@ $^
+	$(CC) $(LTT_CFLAGS) $(CFLAGS) -lltt-usertrace-fast -o $@ $^
 
 sample-printf: sample-printf.c ltt-facility-loader-user_generic.c
-	$(CC) $(CFLAGS) -o $@ $^
+	$(CC) $(LTT_CFLAGS) $(CFLAGS) -o $@ $^
 
 sample-instrument-fct: sample-instrument-fct.c
-	$(CC) $(CFLAGS) -L. -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 $@ $^
+	$(CC) $(LTT_CFLAGS) $(CFLAGS) -lpthread -o $@ $^
 
 sample-thread-fast: sample-thread-fast.c ltt-facility-loader-user_generic.c
-	$(CC) $(CFLAGS) -lpthread -o $@ $^
+	$(CC) $(LTT_CFLAGS) $(CFLAGS) -lpthread -lltt-usertrace-fast -o $@ $^
 
 
 #LIBRAIRIES
@@ -49,7 +51,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
@@ -59,17 +61,24 @@ 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
+%.o: %.c
+	$(CC) $(LTT_CFLAGS) $(CFLAGS) -c -o $@ $+
+
+.PHONY : clean install libs install_libs install_headers samples
 
-install:
+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)
 
+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.0
+	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