X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=fe0bbaa399292655867d5825cbad5e04555515bf;hb=15612a0fc0d9e9fc8a6f2f9339f209e8a51e6b0c;hp=e3a4bbdc4eed8a5821ab3f19a7c24a6445480f5b;hpb=c7dc133cff3db7336bb97fcb57c2dec559942518;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index e3a4bbdc..fe0bbaa3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,16 @@
-ACLOCAL_AMFLAGS = -I m4
+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 libustcomm libust . tests libmallocwrap ustd ustctl libinterfork include
+SUBDIRS = snprintf libust include doc
 
-EXTRA_DIST = doc libust.ldscript.in libust-initializer.c
-dist_bin_SCRIPTS = usttrace
+#temporarily disabled
+# . tests 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 +18,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) -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