From: Pierre-Marc Fournier Date: Mon, 14 Dec 2009 07:06:18 +0000 (-0500) Subject: Fix compilation of libust-initializer.o X-Git-Tag: v0.1~33 X-Git-Url: http://git.lttng.org/?p=ust.git;a=commitdiff_plain;h=89edbbc3ab8ae58e3c6d9c47e7a123f1514d0338 Fix compilation of libust-initializer.o The explicit rule in /Makefile.am to build libust-initializer.o was not being considered. This is because programs that depend on it were being built before it, triggering the use of an implicit rule to build it. Changing SUBDIRS in /Makefile.am to include "." insures libust-initializer.o is built first with the right rule. --- diff --git a/Makefile.am b/Makefile.am index 2262c22..be14587 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,11 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork include + +# 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 = libust . tests libmallocwrap ustd ustctl libinterfork include EXTRA_DIST = doc libust.ldscript.in libust-initializer.c dist_bin_SCRIPTS = usttrace