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 |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Make.defines.linux b/Make.defines.linux
index 8c48553..9e30018 100755
--- a/Make.defines.linux
+++ b/Make.defines.linux
@@ -2,19 +2,32 @@
 
 # Definitions required in all program directories to compile and link
 # C programs using gcc.
-
+DEBUG=y
 CC = g++
 COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
 LINK.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
 LDFLAGS=
+LDDIR += -L$(ROOT)/lib
+LDLIBS += $(LDDIR) $(EXTRALIBS)
+INCLUDE += -I. -I./include -I$(ROOT)/include -I$(ROOT)/include/usgcommon
 
+ifeq ($(DEBUG),y)
+  DEBFLAGS = -O -g # "-O" is needed to expand inlines
+else
+  DEBFLAGS = -O2
+endif
 
-CFLAGS = $(INCLUDE) -g -std=c++11 -mcx16 -Wall  -DLINUX -D_GNU_SOURCE $(EXTRA)
+CFLAGS += $(INCLUDE)  $(DEBFLAGS) -mcx16 -std=c++11 -Wall -DLINUX -D_GNU_SOURCE $(EXTRA)
 RANLIB=echo
 AR=ar
 AWK=awk
+#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 
+	$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
+
 

--
Gitblit v1.8.0