Use inheritance for trace descriptor and positions

[babeltrace.git] / converter / Makefile.am

diff --git a/converter/Makefile.am b/converter/Makefile.am
index 3ecca8c2c24d61f3637f78d090479eabc0832d9b..c7ff134d8abec6112c23bcaccffefe24c1aa5403 100644 (file)
--- a/converter/Makefile.am
+++ b/converter/Makefile.am
@@ -1,12 +1,24 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
+AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -lpopt
 
 bin_PROGRAMS = babeltrace
 
+#lib_LTLIBRARIES = libbabeltrace.la
+#
+#libbabeltrace_la_SOURCES = \
+#      babeltrace-lib.c
+#
+#libbabeltrace_la_LIBADD = \
+#      $(top_builddir)/types/libbabeltrace_types.la \
+#      $(top_builddir)/formats/libbabeltrace_registry.la \
+#      $(top_builddir)/formats/ctf/libctf.la
+
 babeltrace_SOURCES = \
        babeltrace.c
 
-babeltrace_LDADD = \
-       $(top_srcdir)/types/libtypes.a \
-       $(top_srcdir)/formats/libregistry.a
-
+#babeltrace_LDADD = \
+#      libbabeltrace.la
 
+babeltrace_LDADD = \
+       $(top_builddir)/types/libbabeltrace_types.la \
+       $(top_builddir)/formats/libbabeltrace_registry.la \
+       $(top_builddir)/formats/ctf/libctf.la