X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bindings%2Fpython%2Fbt2%2FMakefile.am;h=31d9e1773c4ab0d24c969dd13607ef72b8151e22;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=f41e2c07ce6e92ede4f1c42f0da39a9a3596c397;hpb=1b8fb86234d51aff255b8e97435d4dbb3316eaec;p=babeltrace.git

diff --git a/bindings/python/bt2/Makefile.am b/bindings/python/bt2/Makefile.am
index f41e2c07..31d9e177 100644
--- a/bindings/python/bt2/Makefile.am
+++ b/bindings/python/bt2/Makefile.am
@@ -1,63 +1,67 @@
 # Since the shared object used by the python bindings is not built with
-# libtool, we need to add the directory containing libbabeltrace to the
+# libtool, we need to add the directory containing libbabeltrace2 to the
 # linker path.
 AM_LDFLAGS=-L$(top_builddir)/lib/.libs
 
 INSTALLED_FILES=$(builddir)/installed_files.txt
 
-STATIC_BINDINGS_DEPS =			\
-	bt2/logging.c			\
-	bt2/logging.h			\
-	bt2/native_btccpriomap.i	\
-	bt2/native_btclockclass.i	\
-	bt2/native_btcomponentclass.i	\
-	bt2/native_btcomponent.i	\
-	bt2/native_btconnection.i	\
-	bt2/native_btctfwriter.i	\
-	bt2/native_bteventclass.i	\
-	bt2/native_btevent.i		\
-	bt2/native_btfields.i		\
-	bt2/native_btft.i		\
-	bt2/native_btgraph.i		\
-	bt2/native_bt.i			\
-	bt2/native_btlogging.i		\
-	bt2/native_btnotification.i	\
-	bt2/native_btnotifiter.i	\
-	bt2/native_btpacket.i		\
-	bt2/native_btplugin.i		\
-	bt2/native_btport.i		\
-	bt2/native_btref.i		\
-	bt2/native_btstreamclass.i	\
-	bt2/native_btstream.i		\
-	bt2/native_bttrace.i		\
-	bt2/native_btvalues.i		\
-	bt2/native_btversion.i		\
-	bt2/clock_class_priority_map.py	\
-	bt2/clock_class.py		\
-	bt2/component.py		\
-	bt2/connection.py		\
-	bt2/ctf_writer.py		\
-	bt2/event_class.py		\
-	bt2/event.py			\
-	bt2/fields.py			\
-	bt2/field_types.py		\
-	bt2/graph.py			\
-	bt2/logging.py			\
-	bt2/notification_iterator.py	\
-	bt2/notification.py		\
-	bt2/object.py			\
-	bt2/packet.py			\
-	bt2/plugin.py			\
-	bt2/port.py			\
-	bt2/py_plugin.py		\
-	bt2/stream_class.py		\
-	bt2/stream.py			\
-	bt2/trace.py			\
-	bt2/utils.py			\
-	bt2/values.py
+STATIC_BINDINGS_DEPS =					\
+	bt2/logging.c					\
+	bt2/logging.h					\
+	bt2/native_bt_clock_class.i			\
+	bt2/native_bt_clock_snapshot.i			\
+	bt2/native_bt_component_class.i			\
+	bt2/native_bt_component.i			\
+	bt2/native_bt_connection.i			\
+	bt2/native_bt_event_class.i			\
+	bt2/native_bt_event.i				\
+	bt2/native_bt_field_class.i			\
+	bt2/native_bt_field_path.i			\
+	bt2/native_bt_field.i				\
+	bt2/native_bt_graph.i				\
+	bt2/native_bt.i					\
+	bt2/native_bt_logging.i				\
+	bt2/native_bt_message.i				\
+	bt2/native_bt_notifier.i			\
+	bt2/native_bt_packet.i				\
+	bt2/native_bt_plugin.i				\
+	bt2/native_bt_port.i				\
+	bt2/native_bt_query_exec.i			\
+	bt2/native_bt_stream_class.i			\
+	bt2/native_bt_stream.i				\
+	bt2/native_bt_trace_class.i			\
+	bt2/native_bt_trace.i				\
+	bt2/native_bt_value.i				\
+	bt2/native_bt_version.i				\
+	bt2/clock_class.py				\
+	bt2/clock_snapshot.py				\
+	bt2/component.py				\
+	bt2/connection.py				\
+	bt2/event_class.py				\
+	bt2/event.py					\
+	bt2/field.py					\
+	bt2/field_class.py				\
+	bt2/field_path.py				\
+	bt2/graph.py					\
+	bt2/logging.py					\
+	bt2/message_iterator.py				\
+	bt2/message.py					\
+	bt2/object.py					\
+	bt2/packet.py					\
+	bt2/plugin.py					\
+	bt2/port.py					\
+	bt2/py_plugin.py				\
+	bt2/query_executor.py				\
+	bt2/stream_class.py				\
+	bt2/stream.py					\
+	bt2/trace.py					\
+	bt2/trace_class.py				\
+	bt2/trace_collection_message_iterator.py	\
+	bt2/utils.py					\
+	bt2/value.py
 
-GENERATED_BINDINGS_DEPS =		\
-	bt2/__init__.py			\
+GENERATED_BINDINGS_DEPS =	\
+	bt2/__init__.py		\
 	setup.py
 
 BUILD_FLAGS=CC="$(CC)" \
@@ -67,9 +71,17 @@ BUILD_FLAGS=CC="$(CC)" \
 
 all-local: build-python-bindings.stamp
 
-build-python-bindings.stamp: $(STATIC_BINDINGS_DEPS) $(GENERATED_BINDINGS_DEPS)
-	$(BUILD_FLAGS) $(PYTHON) $(builddir)/setup.py build_ext
-	$(BUILD_FLAGS) $(PYTHON) $(builddir)/setup.py build
+copy-static-deps.stamp: $(addprefix $(srcdir)/, $(STATIC_BINDINGS_DEPS))
+	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+		for file in $(STATIC_BINDINGS_DEPS); do \
+			cp -f $(srcdir)/$$file $(builddir)/$$file; \
+		done; \
+	fi
+	touch $@
+
+build-python-bindings.stamp: copy-static-deps.stamp $(GENERATED_BINDINGS_DEPS)
+	$(BUILD_FLAGS) $(PYTHON) $(builddir)/setup.py build_ext --force --swig "$(SWIG)"
+	$(BUILD_FLAGS) $(PYTHON) $(builddir)/setup.py build --force
 	touch $@
 
 install-exec-local: build-python-bindings.stamp
@@ -81,6 +93,11 @@ install-exec-local: build-python-bindings.stamp
 
 clean-local:
 	rm -rf $(builddir)/build
+	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+		for file in $(STATIC_BINDINGS_DEPS); do \
+			rm -f $(builddir)/$$file; \
+		done; \
+	fi
 
 # Distutils' setup.py does not include an uninstall target, we thus need to do
 # it manually. We save the path of the files that were installed during the install target
@@ -97,4 +114,4 @@ uninstall-local:
 EXTRA_DIST = $(STATIC_BINDINGS_DEPS)
 
 # clean: generated C and Python files (by SWIG)
-CLEANFILES = bt2/native_bt.py bt2/native_bt_wrap.c build-python-bindings.stamp
+CLEANFILES = bt2/native_bt.py bt2/native_bt_wrap.c build-python-bindings.stamp copy-static-deps.stamp