From a602c0c750dffad185bf6a2b4661e1aa430ad24a Mon Sep 17 00:00:00 2001 From: Yevgen Muntyan <17531749+muntyan@users.noreply.github.com> Date: Wed, 10 Jan 2007 04:19:06 -0600 Subject: [PATCH] Use $@.tmp and $@ in generated files rules --- medit/Makefile.am | 3 +- moo.mprj | 2 +- moo/mooapp/Makefile.am | 3 +- moo/mooedit/Makefile.am | 52 +++++++++---------- moo/mooedit/plugins/Makefile.am | 3 +- moo/mooedit/plugins/activestrings/Makefile.am | 3 +- moo/mooedit/plugins/completion/Makefile.am | 3 +- moo/mooedit/plugins/fileselector/Makefile.am | 6 ++- moo/moofileview/Makefile.am | 22 ++++---- moo/mooterm/Makefile.am | 4 +- moo/mooutils/Makefile.am | 23 ++++---- 11 files changed, 70 insertions(+), 54 deletions(-) diff --git a/medit/Makefile.am b/medit/Makefile.am index 76a77084..138a186c 100644 --- a/medit/Makefile.am +++ b/medit/Makefile.am @@ -30,7 +30,8 @@ endif XML2H = $(srcdir)/../moo/mooutils/xml2h.sh medit-credits.h: ../THANKS $(XML2H) - $(SHELL) $(XML2H) THANKS $(srcdir)/../THANKS > medit-credits.h + $(SHELL) $(XML2H) THANKS $(srcdir)/../THANKS > $@.tmp && \ + mv $@.tmp $@ medit-app.c: medit-app.opag if test -z $(OPAG); then \ diff --git a/moo.mprj b/moo.mprj index abc58924..9229676e 100644 --- a/moo.mprj +++ b/moo.mprj @@ -14,7 +14,7 @@ /home/muntyan/projects/gtk/build/moo - --enable-debug --enable-all-warnings --prefix=$PREFIX --with-fam --with-mooterm + --enable-debug --enable-all-warnings --prefix=$PREFIX --with-fam --with-mooterm --enable-libmoo -g diff --git a/moo/mooapp/Makefile.am b/moo/mooapp/Makefile.am index 0444b28f..a6801895 100644 --- a/moo/mooapp/Makefile.am +++ b/moo/mooapp/Makefile.am @@ -36,7 +36,8 @@ endif XML2H = $(srcdir)/../mooutils/xml2h.sh mooappabout-glade.h: $(srcdir)/glade/mooappabout.glade $(XML2H) - $(SHELL) $(XML2H) MOO_APP_ABOUT_GLADE_UI $(srcdir)/glade/mooappabout.glade > mooappabout-glade.h + $(SHELL) $(XML2H) MOO_APP_ABOUT_GLADE_UI $(srcdir)/glade/mooappabout.glade > $@.tmp && \ + mv $@.tmp $@ noinst_LTLIBRARIES = libmooapp.la libmooapp_la_SOURCES = $(mooapp_sources) diff --git a/moo/mooedit/Makefile.am b/moo/mooedit/Makefile.am index 41a6fcc7..a40d30d3 100644 --- a/moo/mooedit/Makefile.am +++ b/moo/mooedit/Makefile.am @@ -195,45 +195,45 @@ stamp-mooedit-enums.c: $(mooedit_enums_headers) Makefile XML2H = $(srcdir)/../mooutils/xml2h.sh mootextgotoline-glade.h: $(srcdir)/glade/mootextgotoline.glade $(XML2H) - $(SHELL) $(XML2H) MOO_TEXT_GOTO_LINE_GLADE_UI $(srcdir)/glade/mootextgotoline.glade \ - > mootextgotoline-glade.h + $(SHELL) $(XML2H) MOO_TEXT_GOTO_LINE_GLADE_UI $(srcdir)/glade/mootextgotoline.glade > $@.tmp && \ + mv $@.tmp $@ mootextfind-glade.h: $(srcdir)/glade/mootextfind.glade $(XML2H) - $(SHELL) $(XML2H) MOO_TEXT_FIND_GLADE_UI $(srcdir)/glade/mootextfind.glade \ - > mootextfind-glade.h + $(SHELL) $(XML2H) MOO_TEXT_FIND_GLADE_UI $(srcdir)/glade/mootextfind.glade > $@.tmp && \ + mv $@.tmp $@ mooeditprefs-glade.h: $(srcdir)/glade/mooeditprefs.glade $(XML2H) - $(SHELL) $(XML2H) MOO_EDIT_PREFS_GLADE_UI $(srcdir)/glade/mooeditprefs.glade \ - > mooeditprefs-glade.h + $(SHELL) $(XML2H) MOO_EDIT_PREFS_GLADE_UI $(srcdir)/glade/mooeditprefs.glade > $@.tmp && \ + mv $@.tmp $@ mooeditprogress-glade.h: $(srcdir)/glade/mooeditprogress.glade $(XML2H) - $(SHELL) $(XML2H) MOO_EDIT_PROGRESS_GLADE_XML $(srcdir)/glade/mooeditprogress.glade \ - > mooeditprogress-glade.h + $(SHELL) $(XML2H) MOO_EDIT_PROGRESS_GLADE_XML $(srcdir)/glade/mooeditprogress.glade > $@.tmp && \ + mv $@.tmp $@ moopluginprefs-glade.h: $(srcdir)/glade/moopluginprefs.glade $(XML2H) - $(SHELL) $(XML2H) MOO_PLUGIN_PREFS_GLADE_UI $(srcdir)/glade/moopluginprefs.glade \ - > moopluginprefs-glade.h + $(SHELL) $(XML2H) MOO_PLUGIN_PREFS_GLADE_UI $(srcdir)/glade/moopluginprefs.glade > $@.tmp && \ + mv $@.tmp $@ mooeditsavemultiple-glade.h: $(srcdir)/glade/mooeditsavemult.glade $(XML2H) - $(SHELL) $(XML2H) MOO_EDIT_SAVE_MULTIPLE_GLADE_UI $(srcdir)/glade/mooeditsavemult.glade \ - > mooeditsavemultiple-glade.h + $(SHELL) $(XML2H) MOO_EDIT_SAVE_MULTIPLE_GLADE_UI $(srcdir)/glade/mooeditsavemult.glade > $@.tmp && \ + mv $@.tmp $@ quicksearch-glade.h: $(srcdir)/glade/quicksearch.glade $(XML2H) - $(SHELL) $(XML2H) QUICK_SEARCH_GLADE_XML $(srcdir)/glade/quicksearch.glade \ - > quicksearch-glade.h + $(SHELL) $(XML2H) QUICK_SEARCH_GLADE_XML $(srcdir)/glade/quicksearch.glade > $@.tmp && \ + mv $@.tmp $@ statusbar-glade.h: $(srcdir)/glade/statusbar.glade $(XML2H) - $(SHELL) $(XML2H) STATUSBAR_GLADE_XML $(srcdir)/glade/statusbar.glade \ - > statusbar-glade.h + $(SHELL) $(XML2H) STATUSBAR_GLADE_XML $(srcdir)/glade/statusbar.glade > $@.tmp && \ + mv $@.tmp $@ mooprint-glade.h: $(srcdir)/glade/mooprint.glade $(XML2H) - $(SHELL) $(XML2H) MOO_PRINT_GLADE_XML $(srcdir)/glade/mooprint.glade \ - > mooprint-glade.h + $(SHELL) $(XML2H) MOO_PRINT_GLADE_XML $(srcdir)/glade/mooprint.glade > $@.tmp && \ + mv $@.tmp $@ mooedittools-glade.h: $(srcdir)/glade/mooedittools.glade $(XML2H) - $(SHELL) $(XML2H) MOO_EDIT_TOOLS_GLADE_XML $(srcdir)/glade/mooedittools.glade \ - > mooedittools-glade.h + $(SHELL) $(XML2H) MOO_EDIT_TOOLS_GLADE_XML $(srcdir)/glade/mooedittools.glade > $@.tmp && \ + mv $@.tmp $@ mooprintpreview-glade.h: $(srcdir)/glade/mooprintpreview.glade $(XML2H) - $(SHELL) $(XML2H) MOO_PRINT_PREVIEW_GLADE_XML $(srcdir)/glade/mooprintpreview.glade \ - > mooprintpreview-glade.h + $(SHELL) $(XML2H) MOO_PRINT_PREVIEW_GLADE_XML $(srcdir)/glade/mooprintpreview.glade > $@.tmp && \ + mv $@.tmp $@ mooedit-ui.h: mooedit-ui.xml $(XML2H) - $(SHELL) $(XML2H) MOO_EDIT_UI_XML $(srcdir)/mooedit-ui.xml > mooedit-ui.h.tmp && \ - mv mooedit-ui.h.tmp mooedit-ui.h + $(SHELL) $(XML2H) MOO_EDIT_UI_XML $(srcdir)/mooedit-ui.xml > $@.tmp && \ + mv $@.tmp $@ medit-ui.h: medit-ui.xml $(XML2H) - $(SHELL) $(XML2H) MEDIT_UI_XML $(srcdir)/medit-ui.xml > medit-ui.h.tmp && \ - mv medit-ui.h.tmp medit-ui.h + $(SHELL) $(XML2H) MEDIT_UI_XML $(srcdir)/medit-ui.xml > $@.tmp && \ + mv $@.tmp $@ EXTRA_DIST = \ medit-ui.xml \ diff --git a/moo/mooedit/plugins/Makefile.am b/moo/mooedit/plugins/Makefile.am index 10bc796f..c35d5da5 100644 --- a/moo/mooedit/plugins/Makefile.am +++ b/moo/mooedit/plugins/Makefile.am @@ -18,7 +18,8 @@ EXTRA_DIST = \ XML2H = $(srcdir)/../../mooutils/xml2h.sh moofind-glade.h: moofind.glade $(XML2H) - $(SHELL) $(XML2H) MOO_FIND_GLADE_XML $(srcdir)/moofind.glade > moofind-glade.h + $(SHELL) $(XML2H) MOO_FIND_GLADE_XML $(srcdir)/moofind.glade > $@.tmp && \ + mv $@.tmp $@ unix_sources = \ moofind.c \ diff --git a/moo/mooedit/plugins/activestrings/Makefile.am b/moo/mooedit/plugins/activestrings/Makefile.am index eece0b45..ee517169 100644 --- a/moo/mooedit/plugins/activestrings/Makefile.am +++ b/moo/mooedit/plugins/activestrings/Makefile.am @@ -19,7 +19,8 @@ BUILT_SOURCES = \ XML2H = $(srcdir)/../../../mooutils/xml2h.sh as-plugin-glade.h: as-plugin.glade $(XML2H) - $(SHELL) $(XML2H) AS_PLUGIN_GLADE_UI $(srcdir)/as-plugin.glade > as-plugin-glade.h + $(SHELL) $(XML2H) AS_PLUGIN_GLADE_UI $(srcdir)/as-plugin.glade > $@.tmp && \ + mv $@.tmp $@ noinst_LTLIBRARIES = libastrings.la libastrings_la_SOURCES = $(astrings_sources) diff --git a/moo/mooedit/plugins/completion/Makefile.am b/moo/mooedit/plugins/completion/Makefile.am index 9332da4e..3fb86bf8 100644 --- a/moo/mooedit/plugins/completion/Makefile.am +++ b/moo/mooedit/plugins/completion/Makefile.am @@ -20,7 +20,8 @@ BUILT_SOURCES = \ XML2H = $(srcdir)/../../../mooutils/xml2h.sh completion-glade.h: completion.glade $(XML2H) - $(SHELL) $(XML2H) COMPLETION_PLUGIN_GLADE_XML $(srcdir)/completion.glade > completion-glade.h + $(SHELL) $(XML2H) COMPLETION_PLUGIN_GLADE_XML $(srcdir)/completion.glade > $@.tmp && \ + mv $@.tmp $@ noinst_LTLIBRARIES = libcompletion.la libcompletion_la_SOURCES = $(completion_sources) diff --git a/moo/mooedit/plugins/fileselector/Makefile.am b/moo/mooedit/plugins/fileselector/Makefile.am index b0d5d061..2d96e793 100644 --- a/moo/mooedit/plugins/fileselector/Makefile.am +++ b/moo/mooedit/plugins/fileselector/Makefile.am @@ -15,9 +15,11 @@ BUILT_SOURCES = \ XML2H = $(srcdir)/../../../mooutils/xml2h.sh moofileselector-glade.h: moofileselector.glade $(XML2H) - $(SHELL) $(XML2H) MOO_FILE_SELECTOR_GLADE_XML $(srcdir)/moofileselector.glade > moofileselector-glade.h + $(SHELL) $(XML2H) MOO_FILE_SELECTOR_GLADE_XML $(srcdir)/moofileselector.glade > $@.tmp && \ + mv $@.tmp $@ moofileselector-prefs-glade.h: moofileselector-prefs.glade $(XML2H) - $(SHELL) $(XML2H) MOO_FILE_SELECTOR_PREFS_GLADE_XML $(srcdir)/moofileselector-prefs.glade > moofileselector-prefs-glade.h + $(SHELL) $(XML2H) MOO_FILE_SELECTOR_PREFS_GLADE_XML $(srcdir)/moofileselector-prefs.glade > $@.tmp && \ + mv $@.tmp $@ noinst_LTLIBRARIES = libfileselector.la libfileselector_la_SOURCES = $(fileselector_sources) diff --git a/moo/moofileview/Makefile.am b/moo/moofileview/Makefile.am index b8b158a3..3082f136 100644 --- a/moo/moofileview/Makefile.am +++ b/moo/moofileview/Makefile.am @@ -59,23 +59,27 @@ BUILT_SOURCES = \ moobookmarkmgr-glade.h symlink.h: $(moofileview_pixmaps) - gdk-pixbuf-csource --static --build-list \ - SYMLINK_ARROW $(srcdir)/symlink.png \ - SYMLINK_ARROW_SMALL $(srcdir)/symlink-small.png \ - > symlink.h + gdk-pixbuf-csource --static --build-list \ + SYMLINK_ARROW $(srcdir)/symlink.png \ + SYMLINK_ARROW_SMALL $(srcdir)/symlink-small.png > $@.tmp && mv $@.tmp $@ XML2H = $(srcdir)/../mooutils/xml2h.sh moofileview-ui.h: $(srcdir)/moofileview-ui.xml $(XML2H) - $(SHELL) $(XML2H) MOO_FILE_VIEW_UI $(srcdir)/moofileview-ui.xml > moofileview-ui.h + $(SHELL) $(XML2H) MOO_FILE_VIEW_UI $(srcdir)/moofileview-ui.xml > $@.tmp && \ + mv $@.tmp $@ moofileprops-glade.h: $(srcdir)/glade/moofileprops.glade $(XML2H) - $(SHELL) $(XML2H) MOO_FILE_PROPS_GLADE_UI $(srcdir)/glade/moofileprops.glade > moofileprops-glade.h + $(SHELL) $(XML2H) MOO_FILE_PROPS_GLADE_UI $(srcdir)/glade/moofileprops.glade > $@.tmp && \ + mv $@.tmp $@ moocreatefolder-glade.h: $(srcdir)/glade/moocreatefolder.glade $(XML2H) - $(SHELL) $(XML2H) MOO_CREATE_FOLDER_GLADE_UI $(srcdir)/glade/moocreatefolder.glade > moocreatefolder-glade.h + $(SHELL) $(XML2H) MOO_CREATE_FOLDER_GLADE_UI $(srcdir)/glade/moocreatefolder.glade > $@.tmp && \ + mv $@.tmp $@ moobookmarkmgr-glade.h: $(srcdir)/glade/bookmark_editor.glade $(XML2H) - $(SHELL) $(XML2H) MOO_BOOKMARK_MGR_GLADE_UI $(srcdir)/glade/bookmark_editor.glade > moobookmarkmgr-glade.h + $(SHELL) $(XML2H) MOO_BOOKMARK_MGR_GLADE_UI $(srcdir)/glade/bookmark_editor.glade > $@.tmp && \ + mv $@.tmp $@ moofileviewdrop-glade.h: $(srcdir)/glade/drop.glade $(XML2H) - $(SHELL) $(XML2H) MOO_FILE_VIEW_DROP_GLADE_UI $(srcdir)/glade/drop.glade > moofileviewdrop-glade.h + $(SHELL) $(XML2H) MOO_FILE_VIEW_DROP_GLADE_UI $(srcdir)/glade/drop.glade > $@.tmp && \ + mv $@.tmp $@ EXTRA_DIST = \ diff --git a/moo/mooterm/Makefile.am b/moo/mooterm/Makefile.am index 6d2d75ba..535a4f1a 100644 --- a/moo/mooterm/Makefile.am +++ b/moo/mooterm/Makefile.am @@ -68,8 +68,8 @@ mootermparser_yacc: mootermparser-yacc.y XML2H = $(srcdir)/../mooutils/xml2h.sh mootermprefs-glade.h: glade/mootermprefs.glade $(XML2H) - $(SHELL) $(XML2H) MOO_TERM_PREFS_GLADE_UI $(srcdir)/glade/mootermprefs.glade \ - > mootermprefs-glade.h + $(SHELL) $(XML2H) MOO_TERM_PREFS_GLADE_UI $(srcdir)/glade/mootermprefs.glade > $@.tmp && \ + mv $@.tmp $@ noinst_LTLIBRARIES = libmooterm.la diff --git a/moo/mooutils/Makefile.am b/moo/mooutils/Makefile.am index a7fd3e20..07a5204c 100644 --- a/moo/mooutils/Makefile.am +++ b/moo/mooutils/Makefile.am @@ -190,23 +190,28 @@ BUILT_SOURCES = \ stock-moo.h moomarshals.c: moomarshals.list - echo '#include "moomarshals.h"' > moomarshals.c && \ - glib-genmarshal --prefix=_moo_marshal --body \ - $(srcdir)/moomarshals.list >> moomarshals.c + echo '#include "moomarshals.h"' > $@.tmp && \ + glib-genmarshal --prefix=_moo_marshal --body \ + $(srcdir)/moomarshals.list >> $@.tmp && \ + mv $@.tmp $@ moomarshals.h: moomarshals.list - glib-genmarshal --prefix=_moo_marshal --header \ - $(srcdir)/moomarshals.list > moomarshals.h + glib-genmarshal --prefix=_moo_marshal --header \ + $(srcdir)/moomarshals.list > $@.tmp && \ + mv $@.tmp $@ XML2H = $(srcdir)/xml2h.sh mooaccelbutton-glade.h: $(srcdir)/glade/accelbutton.glade $(XML2H) $(SHELL) $(XML2H) MOO_ACCEL_BUTTON_GLADE_UI \ - $(srcdir)/glade/accelbutton.glade > mooaccelbutton-glade.h + $(srcdir)/glade/accelbutton.glade > $@.tmp && \ + mv $@.tmp $@ mooaccelprefs-glade.h: $(srcdir)/glade/accelprefs.glade $(XML2H) $(SHELL) $(XML2H) MOO_ACCEL_PREFS_GLADE_UI \ - $(srcdir)/glade/accelprefs.glade > mooaccelprefs-glade.h + $(srcdir)/glade/accelprefs.glade > $@.tmp && \ + mv $@.tmp $@ moologwindow-glade.h: $(srcdir)/glade/moologwindow.glade $(XML2H) $(SHELL) $(XML2H) MOO_LOG_WINDOW_GLADE_UI \ - $(srcdir)/glade/moologwindow.glade > moologwindow-glade.h + $(srcdir)/glade/moologwindow.glade > $@.tmp && \ + mv $@.tmp $@ mooutils_pixmaps = \ $(srcdir)/pixmaps/gap.png \ @@ -228,7 +233,7 @@ stock-moo.h: $(mooutils_pixmaps) MOO_DETACH_ICON $(srcdir)/pixmaps/detach.png \ MOO_ATTACH_ICON $(srcdir)/pixmaps/attach.png \ MOO_KEEP_ON_TOP_ICON $(srcdir)/pixmaps/keepontop.png \ - > stock-moo.h + > $@.tmp && mv $@.tmp $@ noinst_LTLIBRARIES = libmooutils.la libmooutils_la_SOURCES = $(mooutils_sources)