From a5563dc790a44bb58860d74479a24349f593d68f Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Fri, 15 May 2015 12:48:07 +0300 Subject: [PATCH] Reverted d592417ec815 which added unnecessary code to Makefiles. The original problem it tried to solve was properly fixed by 46969c4cc57e. make will actually wait for processes to finish creating files before it continues to the next program that wants to access the file. As long as the dependencies are correct. --- src/config/Makefile.am | 2 +- src/lib-dict/Makefile.am | 33 ++++++++++++------------ src/lib-fts/Makefile.am | 4 +-- src/lib-sql/Makefile.am | 17 ++++++------- src/lib-storage/register/Makefile.am | 38 +++++++++++++--------------- src/lib/Makefile.am | 2 +- src/plugins/quota/Makefile.am | 5 ++-- 7 files changed, 48 insertions(+), 53 deletions(-) diff --git a/src/config/Makefile.am b/src/config/Makefile.am index d44501cf58..5b2166e78b 100644 --- a/src/config/Makefile.am +++ b/src/config/Makefile.am @@ -55,7 +55,7 @@ pkginclude_HEADERS = \ config-request.h all-settings.c: $(SETTING_FILES) $(top_srcdir)/src/config/settings-get.pl - $(top_srcdir)/src/config/settings-get.pl $(SETTING_FILES) > all-settings.c.tmp && mv all-settings.c.tmp all-settings.c + $(top_srcdir)/src/config/settings-get.pl $(SETTING_FILES) > all-settings.c || rm -f all-settings.c EXTRA_DIST = \ config-settings.c \ diff --git a/src/lib-dict/Makefile.am b/src/lib-dict/Makefile.am index 93edf8f890..9525164a2c 100644 --- a/src/lib-dict/Makefile.am +++ b/src/lib-dict/Makefile.am @@ -46,35 +46,34 @@ pkginc_libdir=$(pkgincludedir) pkginc_lib_HEADERS = $(headers) dict-drivers-register.c: Makefile $(top_builddir)/config.h - rm -f $@.tmp - echo '/* this file automatically generated by Makefile */' >$@.tmp - echo '#include "lib.h"' >>$@.tmp - echo '#include "dict.h"' >>$@.tmp - echo '#include "dict-sql.h"' >>$@.tmp + rm -f $@ + echo '/* this file automatically generated by Makefile */' >$@ + echo '#include "lib.h"' >>$@ + echo '#include "dict.h"' >>$@ + echo '#include "dict-sql.h"' >>$@ for i in $(dict_drivers) null; do \ if [ "$${i}" != "null" ]; then \ - echo "extern struct dict dict_driver_$${i};" >>$@.tmp ; \ + echo "extern struct dict dict_driver_$${i};" >>$@ ; \ fi; \ done - echo 'void dict_drivers_register_all(void) {' >>$@.tmp - echo 'dict_drivers_register_builtin();' >>$@.tmp - echo 'dict_sql_register();' >>$@.tmp + echo 'void dict_drivers_register_all(void) {' >>$@ + echo 'dict_drivers_register_builtin();' >>$@ + echo 'dict_sql_register();' >>$@ for i in $(dict_drivers) null; do \ if [ "$${i}" != "null" ]; then \ - echo "dict_driver_register(&dict_driver_$${i});" >>$@.tmp ; \ + echo "dict_driver_register(&dict_driver_$${i});" >>$@ ; \ fi; \ done - echo '}' >>$@.tmp - echo 'void dict_drivers_unregister_all(void) {' >>$@.tmp - echo 'dict_drivers_unregister_builtin();' >>$@.tmp - echo 'dict_sql_unregister();' >>$@.tmp + echo '}' >>$@ + echo 'void dict_drivers_unregister_all(void) {' >>$@ + echo 'dict_drivers_unregister_builtin();' >>$@ + echo 'dict_sql_unregister();' >>$@ for i in $(dict_drivers) null; do \ if [ "$${i}" != "null" ]; then \ - echo "dict_driver_unregister(&dict_driver_$${i});" >>$@.tmp ; \ + echo "dict_driver_unregister(&dict_driver_$${i});" >>$@ ; \ fi; \ done - echo '}' >>$@.tmp - mv $@.tmp $@ + echo '}' >>$@ distclean-generic: rm -f Makefile dict-drivers-register.c diff --git a/src/lib-fts/Makefile.am b/src/lib-fts/Makefile.am index dba2ee7ca0..e063952879 100644 --- a/src/lib-fts/Makefile.am +++ b/src/lib-fts/Makefile.am @@ -29,12 +29,12 @@ EXTRA_DIST = \ WordBreakProperty.txt: test -f WordBreakProperty.txt || wget http://www.unicode.org/Public/UNIDATA/auxiliary/WordBreakProperty.txt $(srcdir)/word-boundary-data.c: word-properties.pl WordBreakProperty.txt - perl word-properties.pl boundaries WordBreakProperty.txt > $@.tmp && mv $@.tmp $@ + perl word-properties.pl boundaries WordBreakProperty.txt > $@ PropList.txt: test -f PropList.txt || wget http://www.unicode.org/Public/UNIDATA/PropList.txt $(srcdir)/word-break-data.c: word-properties.pl PropList.txt - perl word-properties.pl breaks PropList.txt > $@.tmp && mv $@.tmp $@ + perl word-properties.pl breaks PropList.txt > $@ if BUILD_FTS_STEMMER diff --git a/src/lib-sql/Makefile.am b/src/lib-sql/Makefile.am index c17dd9d723..489f257bee 100644 --- a/src/lib-sql/Makefile.am +++ b/src/lib-sql/Makefile.am @@ -104,27 +104,26 @@ pkginc_libdir=$(pkgincludedir) pkginc_lib_HEADERS = $(headers) sql-drivers-register.c: Makefile - rm -f $@.tmp - echo '/* this file automatically generated by Makefile */' >$@.tmp - echo '#include "lib.h"' >>$@.tmp - echo '#include "sql-api.h"' >>$@.tmp + rm -f $@ + echo '/* this file automatically generated by Makefile */' >$@ + echo '#include "lib.h"' >>$@ + echo '#include "sql-api.h"' >>$@ if ! SQL_PLUGINS for i in $(sql_drivers) null; do \ if [ "$${i}" != "null" ]; then \ - echo "extern struct sql_db driver_$${i}_db;" >>$@.tmp ; \ + echo "extern struct sql_db driver_$${i}_db;" >>$@ ; \ fi; \ done endif - echo 'void sql_drivers_register_all(void) {' >>$@.tmp + echo 'void sql_drivers_register_all(void) {' >>$@ if ! SQL_PLUGINS for i in $(sql_drivers) null; do \ if [ "$${i}" != "null" ]; then \ - echo "sql_driver_register(&driver_$${i}_db);" >>$@.tmp ; \ + echo "sql_driver_register(&driver_$${i}_db);" >>$@ ; \ fi; \ done endif - echo '}' >>$@.tmp - mv $@.tmp $@ + echo '}' >>$@ if SQL_PLUGINS install-exec-local: diff --git a/src/lib-storage/register/Makefile.am b/src/lib-storage/register/Makefile.am index 5332adfddc..81bf754618 100644 --- a/src/lib-storage/register/Makefile.am +++ b/src/lib-storage/register/Makefile.am @@ -5,36 +5,34 @@ mail_storages = @mail_storages@ mailbox_list_drivers = @mailbox_list_drivers@ mail-storage-register.c: Makefile - rm -f $@.tmp - echo '/* this file automatically generated by Makefile */' >$@.tmp - echo '#include "lib.h"' >>$@.tmp - echo '#include "mail-storage.h"' >>$@.tmp + rm -f $@ + echo '/* this file automatically generated by Makefile */' >$@ + echo '#include "lib.h"' >>$@ + echo '#include "mail-storage.h"' >>$@ for i in $(mail_storages) ; do \ - echo "extern struct mail_storage $${i}_storage;" >>$@.tmp ; \ + echo "extern struct mail_storage $${i}_storage;" >>$@ ; \ done - echo 'void mail_storage_register_all(void) {' >>$@.tmp + echo 'void mail_storage_register_all(void) {' >>$@ for i in $(mail_storages) ; do \ - echo "mail_storage_class_register(&$${i}_storage);" >>$@.tmp ; \ + echo "mail_storage_class_register(&$${i}_storage);" >>$@ ; \ done - echo '}' >>$@.tmp - mv $@.tmp $@ + echo '}' >>$@ mailbox-list-register.c: Makefile - rm -f $@.tmp - echo '/* this file automatically generated by Makefile */' >$@.tmp - echo '#include "lib.h"' >>$@.tmp - echo '#include "mailbox-list.h"' >>$@.tmp + rm -f $@ + echo '/* this file automatically generated by Makefile */' >$@ + echo '#include "lib.h"' >>$@ + echo '#include "mailbox-list.h"' >>$@ for i in $(mailbox_list_drivers) ; do \ - echo "extern struct mailbox_list $${i}_mailbox_list;" >>$@.tmp ; \ + echo "extern struct mailbox_list $${i}_mailbox_list;" >>$@ ; \ done - echo "void mailbox_list_index_init(void);" >>$@.tmp - echo 'void mailbox_list_register_all(void) {' >>$@.tmp + echo "void mailbox_list_index_init(void);" >>$@ + echo 'void mailbox_list_register_all(void) {' >>$@ for i in $(mailbox_list_drivers) ; do \ - echo "mailbox_list_register(&$${i}_mailbox_list);" >>$@.tmp ; \ + echo "mailbox_list_register(&$${i}_mailbox_list);" >>$@ ; \ done - echo "mailbox_list_index_init();" >>$@.tmp - echo '}' >>$@.tmp - mv $@.tmp $@ + echo "mailbox_list_index_init();" >>$@ + echo '}' >>$@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 6e6154cf3a..7fbd3700c9 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -8,7 +8,7 @@ UnicodeData.txt: test -f UnicodeData.txt || wget http://www.unicode.org/Public/UNIDATA/UnicodeData.txt $(srcdir)/unicodemap.c: unicodemap.pl UnicodeData.txt - perl $(srcdir)/unicodemap.pl < UnicodeData.txt > $@.tmp && mv $@.tmp $@ + perl $(srcdir)/unicodemap.pl < UnicodeData.txt > $@ liblib_la_SOURCES = \ abspath.c \ diff --git a/src/plugins/quota/Makefile.am b/src/plugins/quota/Makefile.am index 1276442e40..cdc06c7bfb 100644 --- a/src/plugins/quota/Makefile.am +++ b/src/plugins/quota/Makefile.am @@ -83,11 +83,10 @@ rquota_xdr.c: Makefile rquota.h sed -e 's/IXDR_PUT/(void)IXDR_PUT/g' \ -e 's,/usr/include/rpcsvc/rquota.h,rquota.h,' \ -e 's/int32_t \*buf/int32_t *buf ATTR_UNUSED/' \ - -e 's/^static char rcsid.*//' ) > rquota_xdr.c.tmp; \ - mv rquota_xdr.c.tmp rquota_xdr.c + -e 's/^static char rcsid.*//' ) > rquota_xdr.c rquota.h: Makefile $(RQUOTA_X) - $(RPCGEN) -h $(RQUOTA_X) > rquota.h.tmp && mv rquota.h.tmp rquota.h + $(RPCGEN) -h $(RQUOTA_X) > rquota.h quota-fs.lo: rquota.h -- 2.47.3