merge changes from master

1 files changed, 42 insertions, 0 deletions

diff --git a/src/report-python/Makefile.am b/src/report-python/Makefile.am
new file mode 100644
index 00000000..a00e2d7b
--- /dev/null
+++ b/src/report-python/Makefile.am
@@ -0,0 +1,42 @@
+pyreportexecdir = $(pyexecdir)/report
+
+pyreportexec_PYTHON = \
+    __init__.py \
+    accountmanager.py
+
+pyreportexec_LTLIBRARIES = _pyreport.la
+
+_pyreport_la_SOURCES = \
+    reportmodule.c \
+    crash_data.c \
+    dump_dir.c \
+    run_event.c \
+    common.h
+_pyreport_la_CPPFLAGS = \
+    -I$(srcdir)/../include/report -I$(srcdir)/../include \
+    -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
+    -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
+    -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
+    -DLOCALSTATEDIR='"$(localstatedir)"' \
+    -DCONF_DIR=\"$(CONF_DIR)\" \
+    -DVAR_RUN=\"$(VAR_RUN)\" \
+    $(GLIB_CFLAGS) \
+    $(PYTHON_CFLAGS) \
+    -D_GNU_SOURCE \
+    -Wall -Werror
+_pyreport_la_LDFLAGS = \
+    -module \
+    -avoid-version \
+    -export-symbols-regex init_pyreport
+_pyreport_la_LIBADD = \
+    ../lib/libreport.la
+
+# report compat:
+
+pyreportioexecdir = $(pyexecdir)/report/io
+
+pyreportioexec_PYTHON = \
+    io/__init__.py \
+    io/GTKIO.py \
+    io/NewtIO.py \
+    io/TextIO.py