X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=0a64094b756e6a09dce3ed8ad0b700de33f9ecbb;hb=1ea2c2dfbd051d7ab86a2161b48aa8e4a2f2b5e2;hp=4f5ae8c1876cbfa2ac9f05d7cb0dc7c755c8a2c6;hpb=b35d179d7be2ab0cb4a9c698b86d78928089fc39;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 4f5ae8c1..0a64094b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,29 +1,10 @@
 ACLOCAL_AMFLAGS = -I config
 
-# 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 liblttng-ust-comm libringbuffer libust include doc tests
+SUBDIRS = . snprintf liblttng-ust-comm libringbuffer libust include doc \
+		libustjava libustfork tests
 
 #temporarily disabled
-# . libustinstr-malloc libustfork
-
-EXTRA_DIST = libust.ldscript.in libust-initializer.c libust-initializer.h
-
-ldscriptsdir = $(libdir)
-ldscripts_DATA = libust.so libust-initializer.o
-
-CLEANFILES = $(ldscripts_DATA) ./tests/libust-initializer.Po
-
-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 $@ $<
+# . libustinstr-malloc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = ust.pc