X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=2262c22a89f74ca64de3fc29333c3b076551a0f1;hb=b5b073e22d34bec71259d39b8946354f170f01a9;hp=f881570042b5b16d1844c32902c64f8b14b35c45;hpb=25123621e72daf757b53fe8b5f28130a98016988;p=ust.git

diff --git a/Makefile.am b/Makefile.am
index f881570..2262c22 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,11 +7,10 @@ dist_bin_SCRIPTS = usttrace
 ldscriptsdir = $(libdir)
 ldscripts_DATA = libust.so libust-initializer.o
 
-CLEANFILES = $(ldscripts_DATA)
+CLEANFILES = $(ldscripts_DATA) ./tests/libust-initializer.Po
 
-libust_FORMAT := $(shell case $(shell uname -m) in (i*86) echo elf32-i386 ;; (x86_64) echo elf64-x86-64 ;; (ppc) echo elf32-powerpc ;; (ppc64) echo elf64-powerpc ;; (s390) echo elf32-s390 ;; (s390x) echo elf64-s390 ;; esac)
 libust.so: libust.ldscript.in
-	$(SED) -e "s@\@FORMAT\@@${libust_FORMAT}@" -e "s@\@PATH\@@${libdir}@g" < $< > $@
+	$(SED) -e "s@\@FORMAT\@@$(LIBFORMAT)@" -e "s@\@PATH\@@${libdir}@g" < $< > $@
 
 libust-initializer.o: libust-initializer.c
-	$(CC) -c $(CFLAGS) -o $@ $<
+	$(CC) $(CFLAGS) -c -I$(top_srcdir)/include -o $@ $<