[Kimchi-devel] [PATCH 23/23] refactor model: Update makefile and specs files

[Aline Manera]

From: Aline Manera <alinefm at br.ibm.com>

Update Makefile and spec files, in order to package the all model classes

Signed-off-by: Aline Manera <alinefm at br.ibm.com>
---
 configure.ac                  |    1 +
 contrib/kimchi.spec.fedora.in |    1 +
 contrib/kimchi.spec.suse.in   |    1 +
 src/kimchi/Makefile.am        |    3 +--
 src/kimchi/model/Makefile.am  |   28 ++++++++++++++++++++++++++++
 5 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 src/kimchi/model/Makefile.am

diff --git a/configure.ac b/configure.ac
index 27c8840..a30a934 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,6 +55,7 @@ AC_CONFIG_FILES([
     src/kimchi/Makefile
     src/kimchi/control/Makefile
     src/kimchi/control/vm/Makefile
+    src/kimchi/model/Makefile
     plugins/Makefile
     plugins/sample/Makefile
     plugins/sample/ui/Makefile
diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in
index f712dc2..2e36d5c 100644
--- a/contrib/kimchi.spec.fedora.in
+++ b/contrib/kimchi.spec.fedora.in
@@ -140,6 +140,7 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/kimchi/*.py*
 %{python_sitelib}/kimchi/control/*.py*
 %{python_sitelib}/kimchi/control/vm/*.py*
+%{python_sitelib}/kimchi/model/*.py*
 %{python_sitelib}/kimchi/API.json
 %{_datadir}/kimchi/doc/API.md
 %{_datadir}/kimchi/doc/README.md
diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in
index 5711604..15db59b 100644
--- a/contrib/kimchi.spec.suse.in
+++ b/contrib/kimchi.spec.suse.in
@@ -62,6 +62,7 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/kimchi/*.py*
 %{python_sitelib}/kimchi/control/*.py*
 %{python_sitelib}/kimchi/control/vm/*.py*
+%{python_sitelib}/kimchi/model/*.py*
 %{python_sitelib}/kimchi/API.json
 %{_datadir}/kimchi/doc/API.md
 %{_datadir}/kimchi/doc/README.md
diff --git a/src/kimchi/Makefile.am b/src/kimchi/Makefile.am
index 0b531a4..ffcdcad 100644
--- a/src/kimchi/Makefile.am
+++ b/src/kimchi/Makefile.am
@@ -20,7 +20,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-SUBDIRS = control
+SUBDIRS = control model
 
 kimchi_PYTHON = \
 	__init__.py        \
@@ -35,7 +35,6 @@ kimchi_PYTHON = \
 	isoinfo.py         \
 	kvmusertests.py    \
 	mockmodel.py       \
-	model.py           \
 	netinfo.py         \
 	network.py         \
 	networkxml.py      \
diff --git a/src/kimchi/model/Makefile.am b/src/kimchi/model/Makefile.am
new file mode 100644
index 0000000..edab6fb
--- /dev/null
+++ b/src/kimchi/model/Makefile.am
@@ -0,0 +1,28 @@
+#
+# Kimchi
+#
+# Copyright IBM Corp, 2013
+#
+# Authors:
+#  Aline Manera <alinefm at linux.vnet.ibm.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+model_PYTHON = *.py
+
+modeldir = $(pythondir)/kimchi/model
+
+install-data-local:
+	$(MKDIR_P) $(DESTDIR)$(modeldir)
-- 
1.7.10.4