[mousetrap/gnome3-wip: 29/240] Update build system. Delete INSTALL (generated).
- From: Heidi Ellis <heidiellis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mousetrap/gnome3-wip: 29/240] Update build system. Delete INSTALL (generated).
- Date: Mon, 8 Sep 2014 15:14:58 +0000 (UTC)
commit 9ebe02453f55ae3b0aa0ec574cd5ecd70ff54d8b
Author: Stoney Jackson <dr stoney gmail com>
Date: Thu Apr 24 13:00:19 2014 -0400
Update build system. Delete INSTALL (generated).
.gitignore | 2 ++
INSTALL | 1 -
configure.ac | 3 +++
src/mousetrap/addons/Makefile.am | 9 +++------
src/mousetrap/core/Makefile.am | 5 +----
src/mousetrap/ui/Makefile.am | 3 ---
6 files changed, 9 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 392f9e8..f20c61f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,5 @@ aclocal.m4
*.py.bak
po/POTFILES
+
+/INSTALL
diff --git a/configure.ac b/configure.ac
index 62cdcb7..08f2bb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,7 +83,9 @@ docs/doxygen/Doxyfile
images/Makefile
src/Makefile
src/mousetrap/Makefile
+src/mousetrap/addons/Makefile
src/mousetrap/app/Makefile
+src/mousetrap/core/Makefile
src/mousetrap/environment.py
src/mousetrap/app/lib/Makefile
src/mousetrap/app/ui/Makefile
@@ -94,6 +96,7 @@ src/mousetrap/ocvfw/Makefile
src/mousetrap/ocvfw/dev/Makefile
src/mousetrap/ocvfw/idm/Makefile
src/mousetrap/ocvfw/haars/Makefile
+src/mousetrap/ui/Makefile
],[chmod +x run_pylint.sh])
###############################################################################
diff --git a/src/mousetrap/addons/Makefile.am b/src/mousetrap/addons/Makefile.am
index 3b294dd..8dd42dd 100644
--- a/src/mousetrap/addons/Makefile.am
+++ b/src/mousetrap/addons/Makefile.am
@@ -1,9 +1,6 @@
-ocvfw_pathdir=$(pyexecdir)
+mousetrap_pathdir=$(pyexecdir)
-ocvfw_python_PYTHON = \
- __init__.py
+mousetrap_python_PYTHON = __init__.py
-ocvfw_pythondir=$(pyexecdir)/mousetrap/addons
+mousetrap_pythondir=$(pyexecdir)/mousetrap/addons
-install-exec-hook:
- chmod a+rx $(DESTDIR)$(ocvfw_pythondir) -R
diff --git a/src/mousetrap/core/Makefile.am b/src/mousetrap/core/Makefile.am
index 6d09c5b..4e4fd17 100644
--- a/src/mousetrap/core/Makefile.am
+++ b/src/mousetrap/core/Makefile.am
@@ -8,11 +8,8 @@ ocvfw_python_PYTHON = \
image_library.py \
motion_tracker.py \
pointer.py \
- pointer_manager \
+ pointer_manager.py \
settings.py \
tracker.py
ocvfw_pythondir=$(pyexecdir)/mousetrap/core
-
-install-exec-hook:
- chmod a+rx $(DESTDIR)$(ocvfw_pythondir) -R
diff --git a/src/mousetrap/ui/Makefile.am b/src/mousetrap/ui/Makefile.am
index e30e425..9640b72 100644
--- a/src/mousetrap/ui/Makefile.am
+++ b/src/mousetrap/ui/Makefile.am
@@ -4,6 +4,3 @@ ocvfw_python_PYTHON = \
__init__.py
ocvfw_pythondir=$(pyexecdir)/mousetrap/ui
-
-install-exec-hook:
- chmod a+rx $(DESTDIR)$(ocvfw_pythondir) -R
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]