X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=liblttng-ust-dl%2FMakefile.am;h=16eefe37021f68f9e2e1725a3760bc4a5de08788;hb=05e8ff1f80c9a6dcd7db559c7a39b4c46e85e2a7;hp=c408fddb35f10845d503a08c02e6dbc67c862d03;hpb=b13d93c24dfd101dc7a7f8ea2567a2164f807cdc;p=deliverable%2Flttng-ust.git

diff --git a/liblttng-ust-dl/Makefile.am b/liblttng-ust-dl/Makefile.am
index c408fddb..16eefe37 100644
--- a/liblttng-ust-dl/Makefile.am
+++ b/liblttng-ust-dl/Makefile.am
@@ -1,16 +1,14 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = -fno-strict-aliasing
+AM_CFLAGS += -I$(srcdir) -fno-strict-aliasing
 
 lib_LTLIBRARIES = liblttng-ust-dl.la
-liblttng_ust_dl_la_SOURCES = ustdl.c
-liblttng_ust_dl_la_LIBADD = \
-	$(top_builddir)/liblttng-ust/liblttng-ust.la
+liblttng_ust_dl_la_SOURCES = \
+	lttng-ust-dl.c \
+	ust_dl.c \
+	ust_dl.h
 
-if LTTNG_UST_BUILD_WITH_LIBDL
-liblttng_ust_dl_la_LIBADD += -ldl
-endif
-if LTTNG_UST_BUILD_WITH_LIBC_DL
-liblttng_ust_dl_la_LIBADD += -lc
-endif
+liblttng_ust_dl_la_LIBADD = \
+	$(top_builddir)/liblttng-ust/liblttng-ust.la \
+	$(DL_LIBS)
 
-libustdl_CFLAGS = -DUST_COMPONENT=liblttng-ust-dl -fno-strict-aliasing
+liblttng_ust_dl_la_CFLAGS = -DUST_COMPONENT=liblttng-ust-dl $(AM_CFLAGS)
+liblttng_ust_dl_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION)