[mousetrap/gnome3-wip: 28/240] Update Makefile.am files and add documentation for autotools.md
- From: Heidi Ellis <heidiellis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mousetrap/gnome3-wip: 28/240] Update Makefile.am files and add documentation for autotools.md
- Date: Mon, 8 Sep 2014 15:14:53 +0000 (UTC)
commit 5427a5bf53405fa90fa24296259789a3871412d0
Author: Stoney Jackson <dr stoney gmail com>
Date: Mon Apr 21 10:42:24 2014 -0400
Update Makefile.am files and add documentation for autotools.md
devel/docs/autotools.md | 4 ++++
src/mousetrap/Makefile.am | 9 +++------
src/mousetrap/addons/Makefile.am | 7 -------
src/mousetrap/core/Makefile.am | 6 ------
src/mousetrap/ui/Makefile.am | 7 -------
5 files changed, 7 insertions(+), 26 deletions(-)
---
diff --git a/devel/docs/autotools.md b/devel/docs/autotools.md
new file mode 100644
index 0000000..73dedb0
--- /dev/null
+++ b/devel/docs/autotools.md
@@ -0,0 +1,4 @@
+# Autotools References
+
+* Basics -- https://developer.gnome.org/anjuta-build-tutorial/stable/create-autotools.html.en
+* Python -- http://www.gnu.org/software/automake/manual/html_node/Python.html
diff --git a/src/mousetrap/Makefile.am b/src/mousetrap/Makefile.am
index 1d4bf8d..3475db3 100644
--- a/src/mousetrap/Makefile.am
+++ b/src/mousetrap/Makefile.am
@@ -10,7 +10,7 @@ mousetrap_python_PYTHON = \
environment.py \
controller.py
-SUBDIRS = app ocvfw
+SUBDIRS = addons app core ocvfw ui
mousetrap_pythondir=$(pyexecdir)/mousetrap/
@@ -19,10 +19,8 @@ install-exec-hook:
##### START DIRECTORY VARIABLE SUBSTITUTIONS ##################################
# Substitution of autotool's directory vars (outside of Makefiles) must be done
-# by make.
-
-# Needed for mousetrap.in
-
+# by make. edit defines a sed substitution for all the special variables. The
+# mousetrap rule calls $(edit)
edit = sed \
-e 's|@PYTHON[ ]|$(PYTHON)|g' \
-e 's|@pythondir[ ]|$(pythondir)|g' \
@@ -30,7 +28,6 @@ edit = sed \
-e 's|@pkgdatadir[ ]|$(pkgdatadir)|g' \
-e 's|@prefix[ ]|$(prefix)|g'
-
mousetrap: Makefile
rm -f $@ $ tmp
srcdir=''; \
diff --git a/src/mousetrap/addons/Makefile.am b/src/mousetrap/addons/Makefile.am
index f068f7b..3b294dd 100644
--- a/src/mousetrap/addons/Makefile.am
+++ b/src/mousetrap/addons/Makefile.am
@@ -1,15 +1,8 @@
ocvfw_pathdir=$(pyexecdir)
-## List all python files in this directory.
-## Don't forget to escape the new line.
ocvfw_python_PYTHON = \
__init__.py
-
-## List all subdirectories.
-#SUBDIRS = dev haars idm
-
-## This should match the current directory.
ocvfw_pythondir=$(pyexecdir)/mousetrap/addons
install-exec-hook:
diff --git a/src/mousetrap/core/Makefile.am b/src/mousetrap/core/Makefile.am
index 18b1440..6d09c5b 100644
--- a/src/mousetrap/core/Makefile.am
+++ b/src/mousetrap/core/Makefile.am
@@ -1,7 +1,5 @@
ocvfw_pathdir=$(pyexecdir)
-## List all python files in this directory.
-## Don't forget to escape the new line.
ocvfw_python_PYTHON = \
__init__.py \
camera.py \
@@ -14,10 +12,6 @@ ocvfw_python_PYTHON = \
settings.py \
tracker.py
-## List all subdirectories.
-#SUBDIRS = dev haars idm
-
-## This should match the current directory.
ocvfw_pythondir=$(pyexecdir)/mousetrap/core
install-exec-hook:
diff --git a/src/mousetrap/ui/Makefile.am b/src/mousetrap/ui/Makefile.am
index 7e83aba..e30e425 100644
--- a/src/mousetrap/ui/Makefile.am
+++ b/src/mousetrap/ui/Makefile.am
@@ -1,15 +1,8 @@
ocvfw_pathdir=$(pyexecdir)
-## List all python files in this directory.
-## Don't forget to escape the new line.
ocvfw_python_PYTHON = \
__init__.py
-
-## List all subdirectories.
-#SUBDIRS = dev haars idm
-
-## This should match the current directory.
ocvfw_pythondir=$(pyexecdir)/mousetrap/ui
install-exec-hook:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]