Alon Bar-Lev has uploaded a new change for review.
Change subject: build: add $(NULL) to end of Makefile statements
......................................................................
build: add $(NULL) to end of Makefile statements
This will ease future patches.
Change-Id: Ibfe8f18c2ae4e90377e67c79416edf0ed74af9c9
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M Makefile.am
M build/Makefile.am
M src/Makefile.am
M src/bin/Makefile.am
M src/java/Makefile.am
M src/otopi/Makefile.am
M src/otopi/codegen/Makefile.am
M src/plugins/Makefile.am
M src/plugins/otopi/Makefile.am
M src/plugins/otopi/core/Makefile.am
M src/plugins/otopi/dialog/Makefile.am
M src/plugins/otopi/network/Makefile.am
M src/plugins/otopi/packagers/Makefile.am
M src/plugins/otopi/services/Makefile.am
M src/plugins/otopi/system/Makefile.am
15 files changed, 136 insertions(+), 66 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/otopi refs/changes/86/10986/1
diff --git a/Makefile.am b/Makefile.am
index 28a45ce..3d4cce4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,16 +30,21 @@
$(srcdir)/config.rpath \
$(srcdir)/ABOUT-NLS \
$(srcdir)/aclocal.m4 \
- $(srcdir)/ln-sr
-CLEANFILES = POTFILES.in.tmp
+ $(srcdir)/ln-sr \
+ $(NULL)
+CLEANFILES = \
+ POTFILES.in.tmp \
+ $(NULL)
EXTRA_DIST = \
- .gitignore
+ .gitignore \
+ $(NULL)
SUBDIRS = \
build \
po \
- src
+ src \
+ $(NULL)
dist_noinst_DATA = \
README.environment \
@@ -47,10 +52,12 @@
README.API \
README.localization \
MAINTAINERS \
- otopi.spec
+ otopi.spec \
+ $(NULL)
dist_noinst_SCRIPTS = \
- autogen.sh
+ autogen.sh \
+ $(NULL)
TMPREPOS = tmp.repos
srpm: dist
diff --git a/build/Makefile.am b/build/Makefile.am
index 38a7191..00e3a6a 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -20,14 +20,18 @@
include $(top_srcdir)/build/subst.inc
MAINTAINERCLEANFILES = \
- $(srcdir)/Makefile.in
+ $(srcdir)/Makefile.in \
+ $(NULL)
CLEANFILES = \
- otopi-bundle
+ otopi-bundle \
+ $(NULL)
SUFFIXES = .in
pkgdata_SCRIPTS = \
- otopi-bundle
+ otopi-bundle \
+ $(NULL)
-otopi-bundle: $(top_srcdir)/configure.ac
-
+otopi-bundle: \
+ $(top_srcdir)/configure.ac \
+ $(NULL)
diff --git a/src/Makefile.am b/src/Makefile.am
index ce052ff..c229c46 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,10 +18,12 @@
#
MAINTAINERCLEANFILES = \
- $(srcdir)/Makefile.in
+ $(srcdir)/Makefile.in \
+ $(NULL)
SUBDIRS = \
bin \
otopi \
plugins \
- java
+ java \
+ $(NULL)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 1a872a0..0010272 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -18,11 +18,16 @@
#
MAINTAINERCLEANFILES = \
- $(srcdir)/Makefile.in
-CLEANFILES = config.py
+ $(srcdir)/Makefile.in \
+ $(NULL)
+CLEANFILES = \
+ config.py \
+ $(NULL)
EXTRA_DIST = \
- .source
+ .source \
+ $(NULL)
dist_sbin_SCRIPTS = \
- otopi
+ otopi \
+ $(NULL)
diff --git a/src/java/Makefile.am b/src/java/Makefile.am
index 88a8795..72cb26c 100644
--- a/src/java/Makefile.am
+++ b/src/java/Makefile.am
@@ -25,29 +25,35 @@
targetjar=$(targetdir)/$(jarname)
MAINTAINERCLEANFILES = \
- $(srcdir)/Makefile.in
+ $(srcdir)/Makefile.in \
+ $(NULL)
CLEANFILES = \
tmp.generated \
- $(targetjar)
+ $(targetjar) \
+ $(NULL)
EXTRA_DIST = \
- .gitignore
+ .gitignore \
+ $(NULL)
dist_noinst_DATA = \
MANIFEST.MF \
Event.java \
SoftError.java \
MachineDialogParser.java \
- MachineDialogParserTest.java
+ MachineDialogParserTest.java \
+ $(NULL)
if JAVA_SDK
if JAVA_SDK_COMPILE
all-local: \
- $(targetjar)
+ $(targetjar) \
+ $(NULL)
else
all-local: \
- sources
+ sources \
+ $(NULL)
endif
clean-local:
@@ -57,7 +63,8 @@
$(targetjar): \
sources \
- pom.xml
+ pom.xml \
+ $(NULL)
rm -f "$(targetjar)"
$(MKDIR_P) "$(targetdir)"
$(MVN) \
@@ -68,7 +75,8 @@
else
$(targetjar): \
- sources
+ sources \
+ $(NULL)
rm -f "$(targetjar)"
$(MKDIR_P) "$(targetdir)"
$(MKDIR_P) target
@@ -82,7 +90,8 @@
src/main/java/org/ovirt/otopi/dialog/Event.java \
src/main/java/org/ovirt/otopi/dialog/SoftError.java \
src/main/java/org/ovirt/otopi/dialog/MachineDialogParser.java \
- src/test/java/org/ovirt/otopi/dialog/MachineDialogParserTest.java
+ src/test/java/org/ovirt/otopi/dialog/MachineDialogParserTest.java \
+ $(NULL)
# TODO: kill __main__ when python-2.6 gone
tmp.generated:
diff --git a/src/otopi/Makefile.am b/src/otopi/Makefile.am
index 2a47736..44b1521 100644
--- a/src/otopi/Makefile.am
+++ b/src/otopi/Makefile.am
@@ -21,13 +21,17 @@
include $(top_srcdir)/build/python.inc
MAINTAINERCLEANFILES = \
- $(srcdir)/Makefile.in
-CLEANFILES = config.py
+ $(srcdir)/Makefile.in \
+ $(NULL)
+CLEANFILES = \
+ config.py \
+ $(NULL)
SUFFIXES = .in
SUBDIRS = \
- codegen
+ codegen \
+ $(NULL)
dist_otopilib_PYTHON = \
__init__.py \
@@ -44,15 +48,21 @@
services.py \
packager.py \
command.py \
- plugin.py
+ plugin.py \
+ $(NULL)
otopilib_PYTHON = \
- config.py
+ config.py \
+ $(NULL)
-config.py: $(top_srcdir)/configure.ac
+config.py: \
+ $(top_srcdir)/configure.ac \
+ $(NULL)
clean-local: \
- python-clean
+ python-clean \
+ $(NULL)
all-local: \
$(DISTFILES) \
- python-syntax-check
+ python-syntax-check \
+ $(NULL)
diff --git a/src/otopi/codegen/Makefile.am b/src/otopi/codegen/Makefile.am
index cc00918..7e34d7a 100644
--- a/src/otopi/codegen/Makefile.am
+++ b/src/otopi/codegen/Makefile.am
@@ -21,16 +21,20 @@
include $(top_srcdir)/build/python.inc
MAINTAINERCLEANFILES = \
- $(srcdir)/Makefile.in
+ $(srcdir)/Makefile.in \
+ $(NULL)
mydir=$(otopilibdir)/codegen
dist_my_PYTHON = \
__init__.py \
- __main__.py
+ __main__.py \
+ $(NULL)
clean-local: \
- python-clean
+ python-clean \
+ $(NULL)
all-local: \
$(DISTFILES) \
- python-syntax-check
+ python-syntax-check \
+ $(NULL)
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 2363b70..98846fa 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -18,6 +18,9 @@
#
MAINTAINERCLEANFILES = \
- $(srcdir)/Makefile.in
+ $(srcdir)/Makefile.in \
+ $(NULL)
-SUBDIRS = otopi
+SUBDIRS = \
+ otopi \
+ $(NULL)
diff --git a/src/plugins/otopi/Makefile.am b/src/plugins/otopi/Makefile.am
index 949ad94..c5ae1ef 100644
--- a/src/plugins/otopi/Makefile.am
+++ b/src/plugins/otopi/Makefile.am
@@ -18,7 +18,8 @@
#
MAINTAINERCLEANFILES = \
- $(srcdir)/Makefile.in
+ $(srcdir)/Makefile.in \
+ $(NULL)
SUBDIRS = \
core \
@@ -26,4 +27,5 @@
system \
network \
services \
- packagers
+ packagers \
+ $(NULL)
diff --git a/src/plugins/otopi/core/Makefile.am
b/src/plugins/otopi/core/Makefile.am
index 83efbf9..614f60f 100644
--- a/src/plugins/otopi/core/Makefile.am
+++ b/src/plugins/otopi/core/Makefile.am
@@ -20,7 +20,8 @@
include $(top_srcdir)/build/python.inc
MAINTAINERCLEANFILES = \
- $(srcdir)/Makefile.in
+ $(srcdir)/Makefile.in \
+ $(NULL)
mydir=$(otopiplugindir)/otopi/core
dist_my_PYTHON = \
@@ -28,10 +29,13 @@
log.py \
misc.py \
config.py \
- transaction.py
+ transaction.py \
+ $(NULL)
clean-local: \
- python-clean
+ python-clean \
+ $(NULL)
all-local: \
- python-syntax-check
+ python-syntax-check \
+ $(NULL)
diff --git a/src/plugins/otopi/dialog/Makefile.am
b/src/plugins/otopi/dialog/Makefile.am
index 813663b..fef6dcb 100644
--- a/src/plugins/otopi/dialog/Makefile.am
+++ b/src/plugins/otopi/dialog/Makefile.am
@@ -20,7 +20,8 @@
include $(top_srcdir)/build/python.inc
MAINTAINERCLEANFILES = \
- $(srcdir)/Makefile.in
+ $(srcdir)/Makefile.in \
+ $(NULL)
mydir=$(otopiplugindir)/otopi/dialog
dist_my_PYTHON = \
@@ -29,10 +30,13 @@
constants.py \
machine.py \
human.py \
- cli.py
+ cli.py \
+ $(NULL)
clean-local: \
- python-clean
+ python-clean \
+ $(NULL)
all-local: \
- python-syntax-check
+ python-syntax-check \
+ $(NULL)
diff --git a/src/plugins/otopi/network/Makefile.am
b/src/plugins/otopi/network/Makefile.am
index 0137ea0..0624961 100644
--- a/src/plugins/otopi/network/Makefile.am
+++ b/src/plugins/otopi/network/Makefile.am
@@ -20,17 +20,21 @@
include $(top_srcdir)/build/python.inc
MAINTAINERCLEANFILES = \
- $(srcdir)/Makefile.in
+ $(srcdir)/Makefile.in \
+ $(NULL)
mydir=$(otopiplugindir)/otopi/network
dist_my_PYTHON = \
__init__.py \
hostname.py \
ssh.py \
- iptables.py
+ iptables.py \
+ $(NULL)
clean-local: \
- python-clean
+ python-clean \
+ $(NULL)
all-local: \
- python-syntax-check
+ python-syntax-check \
+ $(NULL)
diff --git a/src/plugins/otopi/packagers/Makefile.am
b/src/plugins/otopi/packagers/Makefile.am
index 8a8da06..d17df4e 100644
--- a/src/plugins/otopi/packagers/Makefile.am
+++ b/src/plugins/otopi/packagers/Makefile.am
@@ -20,17 +20,21 @@
include $(top_srcdir)/build/python.inc
MAINTAINERCLEANFILES = \
- $(srcdir)/Makefile.in
+ $(srcdir)/Makefile.in \
+ $(NULL)
mydir=$(otopiplugindir)/otopi/packagers
dist_my_PYTHON = \
__init__.py \
yumpackager.py \
miniyumlocal.py \
- miniyum.py
+ miniyum.py \
+ $(NULL)
clean-local: \
- python-clean
+ python-clean \
+ $(NULL)
all-local: \
- python-syntax-check
+ python-syntax-check \
+ $(NULL)
diff --git a/src/plugins/otopi/services/Makefile.am
b/src/plugins/otopi/services/Makefile.am
index c0ff73a..b454b97 100644
--- a/src/plugins/otopi/services/Makefile.am
+++ b/src/plugins/otopi/services/Makefile.am
@@ -20,17 +20,21 @@
include $(top_srcdir)/build/python.inc
MAINTAINERCLEANFILES = \
- $(srcdir)/Makefile.in
+ $(srcdir)/Makefile.in \
+ $(NULL)
mydir=$(otopiplugindir)/otopi/services
dist_my_PYTHON = \
__init__.py \
systemd.py \
rhel.py \
- openrc.py
+ openrc.py \
+ $(NULL)
clean-local: \
- python-clean
+ python-clean \
+ $(NULL)
all-local: \
- python-syntax-check
+ python-syntax-check \
+ $(NULL)
diff --git a/src/plugins/otopi/system/Makefile.am
b/src/plugins/otopi/system/Makefile.am
index daef46d..6bb5dda 100644
--- a/src/plugins/otopi/system/Makefile.am
+++ b/src/plugins/otopi/system/Makefile.am
@@ -20,7 +20,8 @@
include $(top_srcdir)/build/python.inc
MAINTAINERCLEANFILES = \
- $(srcdir)/Makefile.in
+ $(srcdir)/Makefile.in \
+ $(NULL)
mydir=$(otopiplugindir)/otopi/system
dist_my_PYTHON = \
@@ -28,10 +29,13 @@
info.py \
command.py \
reboot.py \
- clock.py
+ clock.py \
+ $(NULL)
clean-local: \
- python-clean
+ python-clean \
+ $(NULL)
all-local: \
- python-syntax-check
+ python-syntax-check \
+ $(NULL)
--
To view, visit http://gerrit.ovirt.org/10986
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibfe8f18c2ae4e90377e67c79416edf0ed74af9c9
Gerrit-PatchSet: 1
Gerrit-Project: otopi
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
