[PATCH 1/3] Better clean.

Cristian Ionescu-Idbohrn cristian.ionescu-idbohrn at axis.com
Sun Oct 6 04:56:15 UTC 2013


Removing both $(HEADERS_NEEDING_MOC:.h=.moc) and qt-ui/*.moc was a
duplication, as all files refered in $(HEADERS_NEEDING_MOC) are located
in directory qt-ui/.

Generated header files qt-ui/ui_*.h were not removed.

Avoid forking `rm' multiple times and regroup file list in a more
intuitive order.

Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn at axis.com>
---
 Rules.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Rules.mk b/Rules.mk
index 1f20e44..75b2913 100644
--- a/Rules.mk
+++ b/Rules.mk
@@ -249,9 +249,11 @@ doc:
 	$(MAKE) -C Documentation doc

 clean:
-	rm -f $(ALL_OBJS) *~ $(NAME) $(NAME).exe po/*~ po/$(NAME)-new.pot \
-		$(VERSION_FILE) $(HEADERS_NEEDING_MOC:.h=.moc) *.moc qt-ui/*.moc .uic/*.h
-	rm -f $(RESOURCES:.qrc=.qrc.cpp)
+	rm -f $(ALL_OBJS) *~ $(NAME) $(VERSION_FILE) \
+		$(NAME).exe po/*~ po/$(NAME)-new.pot \
+		*.moc qt-ui/*.moc \
+		$(UIC_HEADERS:%=qt-ui/%) .uic/*.h \
+		$(RESOURCES:.qrc=.qrc.cpp)
 	rm -rf share

 confclean: clean
-- 
1.8.4.rc3



More information about the subsurface mailing list