X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt-usertrace%2FMakefile;h=cfd4622f05c9341e6e8d924a79dcb21f36a9f750;hb=3a4541a514dc6da3580401c084489910bc769ab7;hp=2b607996fa6e8b90226395bc61bdf2aa685a3979;hpb=976db1b3ea97f6714590ec9cf36ea30b9b6aa59b;p=lttv.git

diff --git a/ltt-usertrace/Makefile b/ltt-usertrace/Makefile
index 2b607996..cfd4622f 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
@@ -13,36 +12,43 @@ LDFLAGS=-L.
 
 all: libs samples
 
+#SAMPLE PROGRAMS
 
-libs: libltt-instrument-functions.a libltt-instrument-functions.so.0 \
-				libltt-usertrace-fast.a libltt-usertrace-fast.so.0
-
-samples: sample-thread sample sample-highspeed sample-printf \
-				sample-instrument-fct
-
-sample-thread: sample-thread.c ltt-facility-loader-user_generic.c
-	$(CC) $(CFLAGS) -lpthread -o $@ $^
+samples: sample sample-highspeed sample-printf \
+				sample-instrument-fct sample-thread-slow sample-thread-fast
 
 sample: sample.c ltt-facility-loader-user_generic.c
-	$(CC) $(CFLAGS) -o $@ $^
+	$(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) $(LTT_CFLAGS) $(CFLAGS) -lpthread -o $@ $^
+
+sample-thread-fast: sample-thread-fast.c ltt-facility-loader-user_generic.c
+	$(CC) $(LTT_CFLAGS) $(CFLAGS) -lpthread -lltt-usertrace-fast -o $@ $^
+
 
-libltt-usertrace-fast.a: ltt-usertrace-fast.o ltt-facility-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: ltt-usertrace-fast.o
 	@rm -f libltt-usertrace-fast.a
 	$(AR) rc $@ $^
 	$(RANLIB) $@
 
-libltt-usertrace-fast.so.0: ltt-usertrace-fast.o ltt-facility-loader-user_generic.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
@@ -52,17 +58,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 $@ $+
 
-install:
+.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)
 
+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