Alon Bar-Lev has uploaded a new change for review.
Change subject: build: minor cleanup
......................................................................
build: minor cleanup
Change-Id: Ibb961bb9e763c029c39f969ba63b4fe2a4913758
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M src/interface-3/Makefile.am
M src/java/Makefile.am
M src/ovirt_host_deploy/Makefile.am
M src/plugins/ovirt-host-deploy/Makefile.am
4 files changed, 16 insertions(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-host-deploy
refs/changes/53/39953/1
diff --git a/src/interface-3/Makefile.am b/src/interface-3/Makefile.am
index 55c4c45..cb2d700 100644
--- a/src/interface-3/Makefile.am
+++ b/src/interface-3/Makefile.am
@@ -27,14 +27,14 @@
--target="$(DESTDIR)$(ovirthostdeployinterfacedir)" \
--root="$(DESTDIR)" \
--otopi-sources="$(OTOPI_SOURCES)"
- rm -f "$(DESTDIR)$(ovirthostdeployinterfacedir)/$(PACKAGE_NAME)"
- $(LN_SR) "$(DESTDIR)$(sbindir)/$(PACKAGE_NAME)"
"$(DESTDIR)$(ovirthostdeployinterfacedir)/$(PACKAGE_NAME)"
+ rm -f "$(DESTDIR)$(ovirthostdeployinterfacedir)/ovirt-host-deploy"
+ $(LN_SR) "$(DESTDIR)$(sbindir)/ovirt-host-deploy"
"$(DESTDIR)$(ovirthostdeployinterfacedir)/ovirt-host-deploy"
rm -f
"$(DESTDIR)$(ovirthostdeployinterfacedir)/pythonlib/ovirt_host_deploy"
$(LN_SR) "$(DESTDIR)$(ovirthostdeploylibdir)"
"$(DESTDIR)$(ovirthostdeployinterfacedir)/pythonlib/ovirt_host_deploy"
- rm -f
"$(DESTDIR)$(ovirthostdeployinterfacedir)/otopi-plugins/$(PACKAGE_NAME)"
- $(LN_SR) "$(DESTDIR)$(ovirthostdeployplugindir)/$(PACKAGE_NAME)"
"$(DESTDIR)$(ovirthostdeployinterfacedir)/otopi-plugins/$(PACKAGE_NAME)"
+ rm -f
"$(DESTDIR)$(ovirthostdeployinterfacedir)/otopi-plugins/ovirt-host-deploy"
+ $(LN_SR) "$(DESTDIR)$(ovirthostdeployplugindir)/ovirt-host-deploy"
"$(DESTDIR)$(ovirthostdeployinterfacedir)/otopi-plugins/ovirt-host-deploy"
rm -f "$(DESTDIR)$(ovirthostdeployinterfacedir)/setup"
- ln -s $(PACKAGE_NAME) "$(DESTDIR)$(ovirthostdeployinterfacedir)/setup"
+ ln -s ovirt-host-deploy "$(DESTDIR)$(ovirthostdeployinterfacedir)/setup"
uninstall-hook:
rm -f "$(DESTDIR)$(ovirthostdeployinterfacedir)/.bundled"
diff --git a/src/java/Makefile.am b/src/java/Makefile.am
index 374e549..6a04fff 100644
--- a/src/java/Makefile.am
+++ b/src/java/Makefile.am
@@ -17,12 +17,15 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
-artifact=ovirt-host-deploy
-generate=ovirt_host_deploy.constants
+artifact = ovirt-host-deploy
-targetdir=$(abs_top_builddir)/target
-jarname=$(artifact)-$(PACKAGE_MAVEN_VERSION).jar
-targetjar=$(targetdir)/$(jarname)
+generate = \
+ ovirt_host_deploy.constants \
+ $(NULL)
+
+targetdir = $(abs_top_builddir)/target
+jarname = $(artifact)-$(PACKAGE_MAVEN_VERSION).jar
+targetjar = $(targetdir)/$(jarname)
MAINTAINERCLEANFILES = \
$(srcdir)/Makefile.in \
diff --git a/src/ovirt_host_deploy/Makefile.am
b/src/ovirt_host_deploy/Makefile.am
index 36903bd..217de67 100644
--- a/src/ovirt_host_deploy/Makefile.am
+++ b/src/ovirt_host_deploy/Makefile.am
@@ -22,6 +22,7 @@
MAINTAINERCLEANFILES = \
$(srcdir)/Makefile.in \
$(NULL)
+
CLEANFILES = \
config.py \
$(NULL)
@@ -45,6 +46,5 @@
$(NULL)
all-local: \
- $(DISTFILES) \
python-syntax-check \
$(NULL)
diff --git a/src/plugins/ovirt-host-deploy/Makefile.am
b/src/plugins/ovirt-host-deploy/Makefile.am
index dd5a72c..6de5c4d 100644
--- a/src/plugins/ovirt-host-deploy/Makefile.am
+++ b/src/plugins/ovirt-host-deploy/Makefile.am
@@ -34,5 +34,5 @@
install-data-local:
$(MKDIR_P) "$(DESTDIR)$(otopiplugindir)"
- rm -f "$(DESTDIR)$(otopiplugindir)/$(PACKAGE_NAME)"
- ln -s "$(ovirthostdeployplugindir)/$(PACKAGE_NAME)"
"$(DESTDIR)$(otopiplugindir)/$(PACKAGE_NAME)"
+ rm -f "$(DESTDIR)$(otopiplugindir)/ovirt-host-deploy"
+ ln -s "$(ovirthostdeployplugindir)/ovirt-host-deploy"
"$(DESTDIR)$(otopiplugindir)/ovirt-host-deploy"
--
To view, visit https://gerrit.ovirt.org/39953
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb961bb9e763c029c39f969ba63b4fe2a4913758
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-host-deploy
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
Gerrit-Reviewer: automat...@ovirt.org
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
