summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2019-03-23 09:01:30 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2019-03-23 09:01:30 (GMT)
commitfd0df8f884336fc69bd0938453f9712c166f08c8 (patch)
treef24313aa72a50d41b8076cf6b257129530bf562e /plugins
parent03d5e6abfce49d4a18bbf70cbbaa3be8c58bf5b4 (diff)
Removed references to local sources if required.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/arm/Makefile.am9
-rw-r--r--plugins/dex/Makefile.am9
-rw-r--r--plugins/dexbnf/Makefile.am9
-rw-r--r--plugins/elf/Makefile.am9
-rw-r--r--plugins/itanium/Makefile.am9
-rw-r--r--plugins/javadesc/Makefile.am9
-rw-r--r--plugins/pychrysalide/Makefile.am2
-rw-r--r--plugins/pychrysalide/pychrysa.c10
8 files changed, 63 insertions, 3 deletions
diff --git a/plugins/arm/Makefile.am b/plugins/arm/Makefile.am
index 3091db7..eb217d7 100644
--- a/plugins/arm/Makefile.am
+++ b/plugins/arm/Makefile.am
@@ -8,9 +8,18 @@ if BUILD_PYTHON3_BINDINGS
PYTHON3_LIBADD = python/libarmpython.la
+if BUILD_DISCARD_LOCAL
+
+PYTHON3_LDFLAGS = -Wl,-rpath,$(pluginslibdir) \
+ -L$(top_srcdir)/plugins/pychrysalide/.libs -l:pychrysalide.so
+
+else
+
PYTHON3_LDFLAGS = -Wl,-rpath,$(abs_top_srcdir)/plugins/pychrysalide/.libs \
-L$(top_srcdir)/plugins/pychrysalide/.libs -l:pychrysalide.so
+endif
+
PYTHON3_SUBDIRS = python
endif
diff --git a/plugins/dex/Makefile.am b/plugins/dex/Makefile.am
index 9b6cb72..7bdf930 100644
--- a/plugins/dex/Makefile.am
+++ b/plugins/dex/Makefile.am
@@ -8,9 +8,18 @@ if BUILD_PYTHON3_BINDINGS
PYTHON3_LIBADD = python/libdexpython.la
+if BUILD_DISCARD_LOCAL
+
+PYTHON3_LDFLAGS = -Wl,-rpath,$(pluginslibdir) \
+ -L$(top_srcdir)/plugins/pychrysalide/.libs -l:pychrysalide.so
+
+else
+
PYTHON3_LDFLAGS = -Wl,-rpath,$(abs_top_srcdir)/plugins/pychrysalide/.libs \
-L$(top_srcdir)/plugins/pychrysalide/.libs -l:pychrysalide.so
+endif
+
PYTHON3_SUBDIRS = python
endif
diff --git a/plugins/dexbnf/Makefile.am b/plugins/dexbnf/Makefile.am
index f460459..da2cc4b 100644
--- a/plugins/dexbnf/Makefile.am
+++ b/plugins/dexbnf/Makefile.am
@@ -8,9 +8,18 @@ if BUILD_PYTHON3_BINDINGS
PYTHON3_LIBADD = python/libdexbnfpython.la
+if BUILD_DISCARD_LOCAL
+
+PYTHON3_LDFLAGS = -Wl,-rpath,$(pluginslibdir) \
+ -L$(top_srcdir)/plugins/pychrysalide/.libs -l:pychrysalide.so
+
+else
+
PYTHON3_LDFLAGS = -Wl,-rpath,$(abs_top_srcdir)/plugins/pychrysalide/.libs \
-L$(top_srcdir)/plugins/pychrysalide/.libs -l:pychrysalide.so
+endif
+
PYTHON3_SUBDIRS = python
endif
diff --git a/plugins/elf/Makefile.am b/plugins/elf/Makefile.am
index 59ee46c..7b243db 100644
--- a/plugins/elf/Makefile.am
+++ b/plugins/elf/Makefile.am
@@ -8,9 +8,18 @@ if BUILD_PYTHON3_BINDINGS
PYTHON3_LIBADD = python/libelfpython.la
+if BUILD_DISCARD_LOCAL
+
+PYTHON3_LDFLAGS = -Wl,-rpath,$(pluginslibdir) \
+ -L$(top_srcdir)/plugins/pychrysalide/.libs -l:pychrysalide.so
+
+else
+
PYTHON3_LDFLAGS = -Wl,-rpath,$(abs_top_srcdir)/plugins/pychrysalide/.libs \
-L$(top_srcdir)/plugins/pychrysalide/.libs -l:pychrysalide.so
+endif
+
PYTHON3_SUBDIRS = python
endif
diff --git a/plugins/itanium/Makefile.am b/plugins/itanium/Makefile.am
index ecbdc93..3d87d41 100644
--- a/plugins/itanium/Makefile.am
+++ b/plugins/itanium/Makefile.am
@@ -8,9 +8,18 @@ if BUILD_PYTHON3_BINDINGS
PYTHON3_LIBADD = python/libitaniumpython.la
+if BUILD_DISCARD_LOCAL
+
+PYTHON3_LDFLAGS = -Wl,-rpath,$(pluginslibdir) \
+ -L$(top_srcdir)/plugins/pychrysalide/.libs -l:pychrysalide.so
+
+else
+
PYTHON3_LDFLAGS = -Wl,-rpath,$(abs_top_srcdir)/plugins/pychrysalide/.libs \
-L$(top_srcdir)/plugins/pychrysalide/.libs -l:pychrysalide.so
+endif
+
PYTHON3_SUBDIRS = python
endif
diff --git a/plugins/javadesc/Makefile.am b/plugins/javadesc/Makefile.am
index 9474a87..c2ad3e7 100644
--- a/plugins/javadesc/Makefile.am
+++ b/plugins/javadesc/Makefile.am
@@ -8,9 +8,18 @@ if BUILD_PYTHON3_BINDINGS
PYTHON3_LIBADD = python/libjavadescpython.la
+if BUILD_DISCARD_LOCAL
+
+PYTHON3_LDFLAGS = -Wl,-rpath,$(pluginslibdir) \
+ -L$(top_srcdir)/plugins/pychrysalide/.libs -l:pychrysalide.so
+
+else
+
PYTHON3_LDFLAGS = -Wl,-rpath,$(abs_top_srcdir)/plugins/pychrysalide/.libs \
-L$(top_srcdir)/plugins/pychrysalide/.libs -l:pychrysalide.so
+endif
+
PYTHON3_SUBDIRS = python
endif
diff --git a/plugins/pychrysalide/Makefile.am b/plugins/pychrysalide/Makefile.am
index d9194b9..25c3e40 100644
--- a/plugins/pychrysalide/Makefile.am
+++ b/plugins/pychrysalide/Makefile.am
@@ -1,5 +1,5 @@
-pkglib_LTLIBRARIES = pychrysalide.la
+lib_LTLIBRARIES = pychrysalide.la
libdir = $(pluginslibdir)
diff --git a/plugins/pychrysalide/pychrysa.c b/plugins/pychrysalide/pychrysa.c
index 3e14add..f9cdad5 100644
--- a/plugins/pychrysalide/pychrysa.c
+++ b/plugins/pychrysalide/pychrysa.c
@@ -579,6 +579,12 @@ static void load_python_plugins(GPluginModule *plugin)
/* Définition des zones d'influence */
+#ifndef DISCARD_LOCAL
+
+ extend_python_path(PACKAGE_SOURCE_DIR G_DIR_SEPARATOR_S "plugins" G_DIR_SEPARATOR_S "python");
+
+#else
+
dir = opendir(PLUGINS_DATA_DIR G_DIR_SEPARATOR_S "python");
if (dir != NULL)
@@ -586,8 +592,8 @@ static void load_python_plugins(GPluginModule *plugin)
closedir(dir);
extend_python_path(PLUGINS_DATA_DIR G_DIR_SEPARATOR_S "python");
}
- else
- extend_python_path(PACKAGE_SOURCE_DIR G_DIR_SEPARATOR_S "plugins" G_DIR_SEPARATOR_S "python");
+
+#endif
g_plugin_module_log_variadic_message(plugin, LMT_INFO,
_("PYTHONPATH environment variable set to '%s'"),