From 695953440565103964e816e7326c66f3d171c3e0 Mon Sep 17 00:00:00 2001
From: jimi-wzq <wangzhengquan85@gmail.com>
Date: 星期六, 01 八月 2020 10:48:18 +0800
Subject: [PATCH] fix conflict

---
 Make.defines.linux |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Make.defines.linux b/Make.defines.linux
index ef20eaa..9e30018 100755
--- a/Make.defines.linux
+++ b/Make.defines.linux
@@ -25,7 +25,7 @@
 
 
 # Common temp files to delete from each directory.
-TEMPFILES=core core.* *.o temp.* *.out *.a *.so
+TEMPFILES=core core.*  **/*.o temp.* *.out *.a *.so
 
 %:	%.c 
 	$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)

--
Gitblit v1.8.0