X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust-python-agent%2FMakefile.am;h=869add4878632c9c4a46c22964a19a20d83db33e;hb=de4dee04fa3e008fe1044538f78778a867563aa4;hp=8b38132e1f7cc1c3e8185e20974cc30583b0ad1d;hpb=e72c9d7ead60e3317bd6d1fade995c07021c947b;p=lttng-ust.git

diff --git a/liblttng-ust-python-agent/Makefile.am b/liblttng-ust-python-agent/Makefile.am
index 8b38132e..869add48 100644
--- a/liblttng-ust-python-agent/Makefile.am
+++ b/liblttng-ust-python-agent/Makefile.am
@@ -1,20 +1,31 @@
+# inputs/outputs
+LTTNGUST_PY_PACKAGE_DIR = $(srcdir)/lttngust
+LTTNGUST_PY_PACKAGE_FILES = agent.py cmd.py debug.py loghandler.py
+LTTNGUST_PY_PACKAGE_SRC = \
+	$(addprefix $(LTTNGUST_PY_PACKAGE_DIR)/,$(LTTNGUST_PY_PACKAGE_FILES))
+INIT_PY_IN = $(srcdir)/__init__.py.in
+INIT_PY = __init__.py
 
-AM_CPPFLAGS = $(PYTHON_INCLUDE) -I$(top_srcdir)/include/ -I$(top_builddir)/include/
-AM_CFLAGS = -fno-strict-aliasing
+# dist files
+EXTRA_DIST = $(INIT_PY_IN) $(LTTNGUST_PY_PACKAGE_SRC)
 
-EXTRA_DIST = lttng_agent.py.in
+# __init__.py with proper version string
+all-local: $(INIT_PY)
 
-nodist_lttng_agent_PYTHON = lttng_agent.py
-lttng_agentdir = $(pythondir)
+$(INIT_PY): $(INIT_PY_IN)
+	$(SED) "s/@LTTNG_UST_VERSION@/$(PACKAGE_VERSION)/g" < $< > $@
 
-lib_LTLIBRARIES = liblttng-ust-python-agent.la
+# Python package
+nodist_lttngust_PYTHON = $(LTTNGUST_PY_PACKAGE_SRC) $(INIT_PY)
+lttngustdir = $(pythondir)/lttngust
 
-nodist_liblttng_ust_python_agent_la_SOURCES = lttng_agent.py
+# tracepoint provider
+AM_CPPFLAGS = $(PYTHON_INCLUDE) -I$(top_srcdir)/include/ \
+	-I$(top_builddir)/include/
+AM_CFLAGS = -fno-strict-aliasing
+lib_LTLIBRARIES = liblttng-ust-python-agent.la
 liblttng_ust_python_agent_la_SOURCES = lttng_ust_python.c lttng_ust_python.h
 liblttng_ust_python_agent_la_LIBADD = -lc -llttng-ust \
-		-L$(top_builddir)/liblttng-ust/.libs
-
-all:
-	$(SED) 's|LIBDIR_STR|$(libdir)|g' < $(srcdir)/lttng_agent.py.in > lttng_agent.py
+	-L$(top_builddir)/liblttng-ust/.libs
 
-CLEANFILES = lttng_agent.py
+CLEANFILES = $(INIT_PY)