summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2009-08-16 14:02:58 -0700
committerMarcel Holtmann <marcel@holtmann.org>2009-08-16 14:02:58 -0700
commit9db1ba0a8911635438002b13c7d435f5c1bcb1d6 (patch)
tree22ab399f638324b677485faf6927ac81725e3d39
parent12cf9d6e64630a1e6f1fa80263bd93eff7b910ce (diff)
downloadconnman-9db1ba0a8911635438002b13c7d435f5c1bcb1d6.tar.gz
connman-9db1ba0a8911635438002b13c7d435f5c1bcb1d6.tar.bz2
connman-9db1ba0a8911635438002b13c7d435f5c1bcb1d6.zip
Use $(AM_V_GEN) for custom rules
-rw-r--r--plugins/Makefile.am16
-rw-r--r--src/Makefile.am12
2 files changed, 15 insertions, 13 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 4cb8c934..d9e5f971 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -221,14 +221,16 @@ EXTRA_DIST = polkit.policy
MAINTAINERCLEANFILES = Makefile.in
builtin.h:
- echo "" > $@
- list='$(builtin_modules)'; for i in $$list; \
+ @echo "" > $@
+ $(AM_V_GEN)list='$(builtin_modules)'; for i in $$list; \
do echo "extern struct connman_plugin_desc __connman_builtin_$$i;" >> $@; done
- echo "" >> $@
- echo "static struct connman_plugin_desc *__connman_builtin[] = {" >> $@
- list='$(builtin_modules)'; for i in $$list; \
+ @echo "" >> $@
+ @echo "static struct connman_plugin_desc *__connman_builtin[] = {" >> $@
+ @list='$(builtin_modules)'; for i in $$list; \
do echo "&__connman_builtin_$$i," >> $@; done
- echo "NULL };" >> $@
+ @echo "NULL };" >> $@
connman.policy: polkit.policy
- cp $< $@
+if POLKIT
+ $(AM_V_GEN)cp $< $@
+endif
diff --git a/src/Makefile.am b/src/Makefile.am
index f8e80f29..7df6478f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,16 +50,16 @@ EXTRA_DIST = connman-dbus.conf connman-polkit.conf
MAINTAINERCLEANFILES = Makefile.in
connman.exp: $(connmand_OBJECTS)
- nm -B *.o | awk '{ print $$3 }' | sort -u | grep -E -e '^connman_' > $@
+ $(AM_V_GEN)nm -B *.o | awk '{ print $$3 }' | sort -u | grep -E -e '^connman_' > $@
connman.ver: connman.exp
- echo "{ global:" > $@
- cat $< | sed -e "s/\(.*\)/\1;/" >> $@
- echo "local: *; };" >> $@
+ @echo "{ global:" > $@
+ $(AM_V_GEN)cat $< | sed -e "s/\(.*\)/\1;/" >> $@
+ @echo "local: *; };" >> $@
connman.conf: connman-dbus.conf connman-polkit.conf
if POLKIT
- cp $(top_srcdir)/src/connman-polkit.conf $@
+ $(AM_V_GEN)cp $(top_srcdir)/src/connman-polkit.conf $@
else
- cp $(top_srcdir)/src/connman-dbus.conf $@
+ $(AM_V_GEN)cp $(top_srcdir)/src/connman-dbus.conf $@
endif