From ed07df16da675c4c123e02a996822daf13d69c63 Mon Sep 17 00:00:00 2001
From: lhoerl <coder@lolux.de>
Date: 周一, 03 8月 2015 22:42:07 +0800
Subject: [PATCH] added full SCPI error messages added list for device dependent error messages some minor changes to get rid of compiler warnings added support for Keil ARM compiler added support for National Instruments CVI compiler removed bug if(c = '\0')...

---
 libscpi/Makefile |   48 +++++++++++++++---------------------------------
 1 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/libscpi/Makefile b/libscpi/Makefile
index 8e57c36..c703e8a 100644
--- a/libscpi/Makefile
+++ b/libscpi/Makefile
@@ -1,24 +1,16 @@
-
-VERSION = 0.3.0
 LIBNAME = scpi
 
-
-CFLAGS += -Wextra -O1 -g -fPIC -Iinc
+CFLAGS += -Wextra -Wmissing-prototypes -Wimplicit -g -Iinc
 LDFLAGS += -Wl,--as-needed
-TESTFLAGS += -lcunit
+TESTFLAGS += -lcunit $(CFLAGS)
 
 OBJDIR=obj
 DISTDIR=dist
 TESTDIR=test
 
 STATICLIBFLAGS = rcs
-SHAREDLIBFLAGS = $(LDFLAGS) -shared -Wl,-soname
-
 
 STATICLIB = lib$(LIBNAME).a
-SHAREDLIB = lib$(LIBNAME).so
-
-SHAREDLIBVER = $(SHAREDLIB).$(VERSION)
 
 SRCS = $(addprefix src/, \
 	debug.c error.c fifo.c ieee488.c \
@@ -38,17 +30,24 @@
 	) \
 
 
-TESTS = $(addprefix test/, \
-	test_fifo.c test_scpi_utils.c test_lexer_parser.c\
+TESTS = $(addprefix $(TESTDIR)/, \
+	test_fifo.c test_scpi_utils.c test_lexer_parser.c test_parser.c\
 	)
 
 TESTS_OBJS = $(TESTS:.c=.o)
 TESTS_BINS = $(TESTS_OBJS:.o=.test)
 
-.PHONY: all clean static shared test
+.PHONY: all clean static test
 
-all: static shared
+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 $@
@@ -62,31 +61,14 @@
 $(DISTDIR)/$(STATICLIB): $(OBJS)
 	$(AR) $(STATICLIBFLAGS) $(DISTDIR)/$(STATICLIB) $(OBJS)
 
-$(DISTDIR)/$(SHAREDLIBVER): $(OBJS)
-	$(CC) $(SHAREDLIBFLAGS),$(SHAREDLIB) -o $(DISTDIR)/$(SHAREDLIBVER) $(OBJS)
 
-$(DISTDIR)/$(SHAREDLIB): $(DISTDIR)/$(SHAREDLIBVER)
-	$(RM) $(DISTDIR)/$(SHAREDLIB)
-	ln -s $(SHAREDLIBVER) $(DISTDIR)/$(SHAREDLIB)
-
-static: $(DISTDIR)/$(STATICLIB)
-
-shared: $(DISTDIR)/$(SHAREDLIB)
-
-
-$(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