From baa6fb17d950c4f5684f5d798f90595456723418 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 28 七月 2020 16:16:46 +0800
Subject: [PATCH] conflict

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

diff --git a/Make.defines.linux b/Make.defines.linux
index 3b61627..9e30018 100755
--- a/Make.defines.linux
+++ b/Make.defines.linux
@@ -8,7 +8,7 @@
 LINK.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
 LDFLAGS=
 LDDIR += -L$(ROOT)/lib
-LDLIBS += $(LDDIR) -lusgcommon $(EXTRALIBS)
+LDLIBS += $(LDDIR) $(EXTRALIBS)
 INCLUDE += -I. -I./include -I$(ROOT)/include -I$(ROOT)/include/usgcommon
 
 ifeq ($(DEBUG),y)
@@ -21,13 +21,13 @@
 RANLIB=echo
 AR=ar
 AWK=awk
-LIBCOMMON=$(ROOT)/common/libusgcommon.a
+#LIBCOMMON=$(ROOT)/common/libusgcommon.a
 
 
 # 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 $(LIBCOMMON)
-	$(CC) $(CFLAGS) $(filter-out $(LIBCOMMON), $^) -o $@ $(LDFLAGS) $(LDLIBS)
+%:	%.c 
+	$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
 
 

--
Gitblit v1.8.0