Alexandre Julliard : Make.rules: Be more specific in make clean, only clean targets that we have created.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Dec 29 06:47:32 CST 2006


Module: wine
Branch: master
Commit: ce25156e48f051d9c88d4c6c0083344a1e7d67de
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ce25156e48f051d9c88d4c6c0083344a1e7d67de

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Dec 29 12:42:25 2006 +0100

Make.rules: Be more specific in make clean, only clean targets that we have created.

---

 Make.rules.in |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Make.rules.in b/Make.rules.in
index 86a40ba..2a6f80c 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -108,10 +108,15 @@ dlldir          = @libdir@/wine
 prog_manext     = 1
 api_manext      = 3w
 conf_manext     = 5
-CLEAN_FILES     = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
-                  *.flc *.res *.mc.rc *.tab.[ch] *.yy.c core
+CLEAN_FILES     = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej *.flc core
+
+IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \
+                 $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c)
+
+CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) \
+                $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) \
+                $(MC_SRCS:.mc=.mc.rc) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res)
 
-IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) 
 OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(EXTRA_OBJS)
 
 RCOBJS = $(RC_SRCS:.rc=.res.o)
@@ -235,7 +240,7 @@ $(EXTRASUBDIRS:%=%/__clean__): dummy
 	-cd `dirname $@` && $(RM) $(CLEAN_FILES)
 
 clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__)
-	$(RM) $(CLEAN_FILES) $(IDL_H_SRCS:.idl=.h) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) $(PROGRAMS) $(RC_BINARIES) $(MANPAGES)
+	$(RM) $(CLEAN_FILES) $(CLEAN_TARGETS) $(PROGRAMS) $(RC_BINARIES) $(MANPAGES)
 
 .PHONY: clean $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__)
 




More information about the wine-cvs mailing list