From c1e514e03ab7de4399ca12c9ae988b0707a99f8b Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周二, 15 9月 2015 03:13:35 +0800
Subject: [PATCH] Resolve #46: Detect missing parameter

---
 libscpi/Makefile |   38 +++++++++++++++++++++-----------------
 1 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/libscpi/Makefile b/libscpi/Makefile
index 3b90cf4..58719cb 100644
--- a/libscpi/Makefile
+++ b/libscpi/Makefile
@@ -1,8 +1,11 @@
 LIBNAME = scpi
 
-CFLAGS += -Wextra -g -Iinc
+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,16 +16,17 @@
 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 \
+	lexer.c expression.c \
 	)
 
 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 \
+	expression.h \
 	) \
 	$(addprefix src/, \
 	lexer_private.h utils_private.h fifo_private.h \
@@ -30,7 +34,7 @@
 	) \
 
 
-TESTS = $(addprefix test/, \
+TESTS = $(addprefix $(TESTDIR)/, \
 	test_fifo.c test_scpi_utils.c test_lexer_parser.c test_parser.c\
 	)
 
@@ -41,6 +45,13 @@
 
 all: static
 
+static: $(DISTDIR)/$(STATICLIB)
+
+clean:
+	$(RM) -r $(OBJDIR) $(DISTDIR) $(TESTS_BINS) $(TESTS_OBJS)
+
+test: $(TESTS_BINS)
+	$(TESTS_BINS:.test=.test &&) true
 
 $(OBJDIR):
 	mkdir -p $@
@@ -54,22 +65,15 @@
 $(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 $@ $<
+	$(CC) -c $(TESTCFLAGS) $(CPPFLAGS) -o $@ $<
 
-$(TESTDIR)/%.test: $(TESTDIR)/%.o
-	$(CC) $(TESTFLAGS) $< $(DISTDIR)/$(STATICLIB) -o $@ $(LDFLAGS)
+$(TESTDIR)/%.test: $(TESTDIR)/%.o $(DISTDIR)/$(STATICLIB)
+	$(CC) $< -o $@ $(DISTDIR)/$(STATICLIB) $(TESTLDFLAGS)
 
 
 

--
Gitblit v1.9.1