Mercurial > hg > octave-jordi
changeset 15114:9300ee32d6ff gui
Be more conservative during "mkae clean"
* gui/src/Makefile.am (SRCDIRS): Add ../qterminal and re-order.
(clean-local): Use rmdir instead of "rm -rf".
(CLEAN_FILES): Add libqterminal_la_MOC.
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Sun, 05 Aug 2012 17:11:28 +0100 |
| parents | acb7c0e6c317 |
| children | 7279c6fc3acb |
| files | gui/src/Makefile.am |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/src/Makefile.am +++ b/gui/src/Makefile.am @@ -5,7 +5,7 @@ endef SRCDIRS = m-editor qtinfo octave-adapter \ - ../qterminal/libqterminal ../qterminal/libqterminal/unix ../qterminal/libqterminal/win32 + ../qterminal/libqterminal/unix ../qterminal/libqterminal/win32 ../qterminal/libqterminal ../qterminal $(foreach dir,. $(SRCDIRS),$(eval $(call MOC_template,$(dir)))) ui_%.h: %.ui @@ -112,7 +112,7 @@ clean-local: -if test "$(srcdir)" != "."; then \ - for d in $(SRCDIRS); do rm -rf $$d; done \ + for d in $(SRCDIRS); do test -d $$d && rmdir $$d; done \ fi BUILT_SOURCES = $(octave_gui_UI_H) @@ -189,3 +189,5 @@ ../qterminal/libqterminal/unix/moc_TerminalView.cpp \ ../qterminal/libqterminal/unix/moc_Vt102Emulation.cpp endif + +CLEANFILES += $(libqterminal_la_MOC)