From 32d8220d39c1eb30b7b1177746819633231701ea Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周四, 27 8月 2015 23:27:22 +0800
Subject: [PATCH] Update travis script

---
 libscpi/Makefile |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libscpi/Makefile b/libscpi/Makefile
index 137ffef..2dc253e 100644
--- a/libscpi/Makefile
+++ b/libscpi/Makefile
@@ -2,7 +2,8 @@
 
 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`
 
 OBJDIR=obj
 DISTDIR=dist
@@ -47,7 +48,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 +67,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