From c40ce04acce103186b4a7eceea6d84ea22499c7d Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 22 4月 2015 02:59:59 +0800
Subject: [PATCH] Add more compile checks and resolve warnings

---
 libscpi/Makefile |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/libscpi/Makefile b/libscpi/Makefile
index 3b90cf4..c703e8a 100644
--- a/libscpi/Makefile
+++ b/libscpi/Makefile
@@ -1,6 +1,6 @@
 LIBNAME = scpi
 
-CFLAGS += -Wextra -g -Iinc
+CFLAGS += -Wextra -Wmissing-prototypes -Wimplicit -g -Iinc
 LDFLAGS += -Wl,--as-needed
 TESTFLAGS += -lcunit $(CFLAGS)
 
@@ -30,7 +30,7 @@
 	) \
 
 
-TESTS = $(addprefix test/, \
+TESTS = $(addprefix $(TESTDIR)/, \
 	test_fifo.c test_scpi_utils.c test_lexer_parser.c test_parser.c\
 	)
 
@@ -41,6 +41,13 @@
 
 all: static
 
+static: $(DISTDIR)/$(STATICLIB)
+
+clean:
+	$(RM) -r $(OBJDIR) $(DISTDIR) $(TESTS_BINS) $(TESTS_OBJS)
+
+test: $(TESTS_BINS)
+	for t in $(TESTS_BINS); do ./$$t; done
 
 $(OBJDIR):
 	mkdir -p $@
@@ -54,21 +61,14 @@
 $(DISTDIR)/$(STATICLIB): $(OBJS)
 	$(AR) $(STATICLIBFLAGS) $(DISTDIR)/$(STATICLIB) $(OBJS)
 
-static: $(DISTDIR)/$(STATICLIB)
 
-$(OBJS): $(HDRS) $(DISTDIR) $(OBJDIR)
-
-clean:
-	$(RM) -r $(OBJDIR) $(DISTDIR) $(TESTS_BINS) $(TESTS_OBJS)
-
-test: static $(TESTS_BINS)
-	for t in $(TESTS_BINS); do ./$$t; done
+$(OBJS): $(HDRS) $(DISTDIR) $(OBJDIR) $(SRCS)
 
 
 $(TESTDIR)/%.o: $(TESTDIR)/%.c
 	$(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
 
-$(TESTDIR)/%.test: $(TESTDIR)/%.o
+$(TESTDIR)/%.test: $(TESTDIR)/%.o $(DISTDIR)/$(STATICLIB)
 	$(CC) $(TESTFLAGS) $< $(DISTDIR)/$(STATICLIB) -o $@ $(LDFLAGS)
 
 

--
Gitblit v1.9.1