From f65ded7a5945cdaf245502c6fa4cdd96fc9a8a53 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周四, 10 9月 2015 07:32:53 +0800
Subject: [PATCH] mend

---
 libscpi/Makefile |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/libscpi/Makefile b/libscpi/Makefile
index 6c49b52..58719cb 100644
--- a/libscpi/Makefile
+++ b/libscpi/Makefile
@@ -2,7 +2,10 @@
 
 CFLAGS += -Wextra -Wmissing-prototypes -Wimplicit -g -Iinc
 LDFLAGS += -Wl,--as-needed
-TESTFLAGS += -lcunit $(CFLAGS)
+#TESTCFLAGS += $(CFLAGS) `pkg-config --cflags cunit`
+#TESTLDFLAGS += $(LDFLAGS) `pkg-config --libs cunit`
+TESTCFLAGS += $(CFLAGS)
+TESTLDFLAGS += $(LDFLAGS) -lcunit
 
 OBJDIR=obj
 DISTDIR=dist
@@ -15,7 +18,7 @@
 SRCS = $(addprefix src/, \
 	error.c fifo.c ieee488.c \
 	minimal.c parser.c units.c utils.c \
-	lexer.c \
+	lexer.c expression.c \
 	)
 
 OBJS = $(addprefix $(OBJDIR)/, $(notdir $(SRCS:.c=.o)))
@@ -23,6 +26,7 @@
 HDRS = $(addprefix inc/scpi/, \
 	scpi.h constants.h error.h \
 	ieee488.h minimal.h parser.h types.h units.h \
+	expression.h \
 	) \
 	$(addprefix src/, \
 	lexer_private.h utils_private.h fifo_private.h \
@@ -66,10 +70,10 @@
 
 
 $(TESTDIR)/%.o: $(TESTDIR)/%.c
-	$(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
+	$(CC) -c $(TESTCFLAGS) $(CPPFLAGS) -o $@ $<
 
 $(TESTDIR)/%.test: $(TESTDIR)/%.o $(DISTDIR)/$(STATICLIB)
-	$(CC) $(TESTFLAGS) $< $(DISTDIR)/$(STATICLIB) -o $@ $(LDFLAGS)
+	$(CC) $< -o $@ $(DISTDIR)/$(STATICLIB) $(TESTLDFLAGS)
 
 
 

--
Gitblit v1.9.1