From 0c7f101ad0e43c33e8dd1b53f6f6746652236b63 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周四, 27 8月 2015 23:41:03 +0800
Subject: [PATCH] Update travis script and add build icon to README

---
 libscpi/Makefile |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/libscpi/Makefile b/libscpi/Makefile
index c703e8a..ac3a1c7 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
@@ -13,7 +16,7 @@
 STATICLIB = lib$(LIBNAME).a
 
 SRCS = $(addprefix src/, \
-	debug.c error.c fifo.c ieee488.c \
+	error.c fifo.c ieee488.c \
 	minimal.c parser.c units.c utils.c \
 	lexer.c \
 	)
@@ -21,7 +24,7 @@
 OBJS = $(addprefix $(OBJDIR)/, $(notdir $(SRCS:.c=.o)))
 
 HDRS = $(addprefix inc/scpi/, \
-	scpi.h constants.h debug.h error.h \
+	scpi.h constants.h error.h \
 	ieee488.h minimal.h parser.h types.h units.h \
 	) \
 	$(addprefix src/, \
@@ -47,7 +50,7 @@
 	$(RM) -r $(OBJDIR) $(DISTDIR) $(TESTS_BINS) $(TESTS_OBJS)
 
 test: $(TESTS_BINS)
-	for t in $(TESTS_BINS); do ./$$t; done
+	$(TESTS_BINS:.test=.test &&) true
 
 $(OBJDIR):
 	mkdir -p $@
@@ -66,10 +69,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