From ef1b8d06a9f5e87d6abb217e9b056257ecdd508a Mon Sep 17 00:00:00 2001 From: Jan Breuer <jan.breuer@jaybee.cz> Date: ćšć, 06 8æ 2015 01:18:00 +0800 Subject: [PATCH] Add LabWindows/CVI example by lhoerl --- libscpi/Makefile | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libscpi/Makefile b/libscpi/Makefile index 3b90cf4..137ffef 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) @@ -13,7 +13,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 +21,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/, \ @@ -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