X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-fork%2FMakefile.am;h=d05f5b933ecd440356b9b3105847f651339b8de5;hb=9d4d2a639afc19a1bd705ea560782917ac892596;hp=49466f6481d6a39a0b3c1623956c2d1f2e1907ec;hpb=2253b139ffb6a4eca7291b60083cc5206a6e128d;p=lttng-ust.git

diff --git a/liblttng-ust-fork/Makefile.am b/liblttng-ust-fork/Makefile.am
index 49466f64..d05f5b93 100644
--- a/liblttng-ust-fork/Makefile.am
+++ b/liblttng-ust-fork/Makefile.am
@@ -1,16 +1,10 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = -fno-strict-aliasing
+AM_CFLAGS += -fno-strict-aliasing
 
 lib_LTLIBRARIES = liblttng-ust-fork.la
 liblttng_ust_fork_la_SOURCES = ustfork.c
 liblttng_ust_fork_la_LIBADD = \
-	$(top_builddir)/liblttng-ust/liblttng-ust.la
+	$(top_builddir)/liblttng-ust/liblttng-ust.la \
+	$(DL_LIBS)
 
-if LTTNG_UST_BUILD_WITH_LIBDL
-liblttng_ust_fork_la_LIBADD += -ldl
-endif
-if LTTNG_UST_BUILD_WITH_LIBC_DL
-liblttng_ust_fork_la_LIBADD += -lc
-endif
-
-libustfork_CFLAGS = -DUST_COMPONENT=liblttng-ust-fork -fno-strict-aliasing
+liblttng_ust_fork_la_CFLAGS = -DUST_COMPONENT=liblttng-ust-fork $(AM_CFLAGS)