# HG changeset patch
# User Michael Goffioul <michael.goffioul@gmail.com>
# Date 1344183088 -3600
# Node ID 9300ee32d6ff56d448f954fd34b6d6298c9bcfbb
# Parent  acb7c0e6c317865f083bef2f92c014287ab13c51
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.

diff -r acb7c0e6c317 -r 9300ee32d6ff gui/src/Makefile.am
--- a/gui/src/Makefile.am	Sun Aug 05 16:24:08 2012 +0100
+++ b/gui/src/Makefile.am	Sun Aug 05 17:11:28 2012 +0100
@@ -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)