Fix java build

[lttng-ust.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index eb0c1b5dade6ca3bd6933e3f553a6239ac11eb02..79ff75359e62eb7991cb4d701c715f03c0186041 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,10 +5,13 @@ ACLOCAL_AMFLAGS = -I config
 # 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 libust . tests libustinstr-malloc libustd ustd ustctl libustfork include doc
+SUBDIRS = snprintf liblttng-ust-comm libringbuffer libust include doc tests \
+               libustjava
 
-EXTRA_DIST = libust.ldscript.in libust-initializer.c
-dist_bin_SCRIPTS = usttrace
+#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
@@ -16,9 +19,12 @@ ldscripts_DATA = libust.so libust-initializer.o
 CLEANFILES = $(ldscripts_DATA) ./tests/libust-initializer.Po
 
 libust.so: libust.ldscript.in
-       $(SED) -e "s@\@FORMAT\@@$(LIBFORMAT)@" < $< > $@
+       $(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 -o $@ $<
+       $(CC) $(CFLAGS) -fno-strict-aliasing -fPIC -c -I$(top_srcdir)/include -I$(top_srcdir) -o $@ $<
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ust.pc