X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=9ab93ccd2377e4aaed9c2bf1107925aec8012174;hb=85f8af7b80f5d52ab099e7f73d3ac8f59c6bb1e9;hp=9e165467764cbef86ca698c7b935fc7786ccb637;hpb=7adb228fd47dcde5f518c9c67afcdef15f575c03;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 9e165467..9ab93ccd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,30 @@
-ACLOCAL_AMFLAGS = -I config
+# SPDX-License-Identifier: LGPL-2.1-only
 
-# The order here is tricky. SUBDIRS applies both to compilation and
-# installation. Programs depending on the libs must be built after
-# libust and '.' (that contains the linker script). However, '.'
-# must be installed after libust so it can overwrite libust.so with
-# the linker script.
-SUBDIRS = snprintf libustcomm libustctl libust . tests libustinstr-malloc libustconsumer ust-consumerd ustctl libustfork include doc
+ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = libust.ldscript.in libust-initializer.c libust-initializer.h
-dist_bin_SCRIPTS = usttrace
+SUBDIRS = \
+	include \
+	src \
+	tools \
+	doc \
+	tests \
+	extras
 
-ldscriptsdir = $(libdir)
-ldscripts_DATA = libust.so libust-initializer.o
+dist_doc_DATA = \
+	ChangeLog \
+	LICENSE \
+	README.md
 
-CLEANFILES = $(ldscripts_DATA) ./tests/libust-initializer.Po
+dist_noinst_DATA = \
+	CodingStyle \
+	CONTRIBUTING.md \
+	LICENSES/BSD-2-Clause \
+	LICENSES/BSD-3-Clause \
+	LICENSES/GPL-2.0 \
+	LICENSES/GPL-3.0 \
+	LICENSES/LGPL-2.1 \
+	LICENSES/MIT
 
-libust.so: libust.ldscript.in
-	$(SED) -e $(if $(LIBFORMAT),"s@\@FORMAT\@@$(LIBFORMAT)@","s@.*\@FORMAT\@.*@@") < $< > $@
-
-# It is very important to compile the initializer with PIC otherwise we
-# may get obscure errors when linking to shared libraries.
-libust-initializer.o: libust-initializer.c
-	$(CC) $(CFLAGS) -fno-strict-aliasing -fPIC -c -I$(top_srcdir)/include -I$(top_srcdir) -o $@ $<
+check-loop:
+	cd tests && $(MAKE) $(AM_MAKEFLAGS) check-loop
+.PHONY: check-loop