From a2006d9935f97a233f75942e1a3eab69f27cf4b3 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 19 4月 2015 17:59:23 +0800
Subject: [PATCH] Update c++ example, make special numbers more correct

---
 libscpi/Makefile |   38 ++++++++++++--------------------------
 1 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/libscpi/Makefile b/libscpi/Makefile
index baa4567..3b90cf4 100644
--- a/libscpi/Makefile
+++ b/libscpi/Makefile
@@ -1,49 +1,45 @@
-
-VERSION = 0.3.0
 LIBNAME = scpi
 
-
-CFLAGS += -Wextra -O1 -g -fPIC -Iinc
+CFLAGS += -Wextra -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 \
 	minimal.c parser.c units.c utils.c \
+	lexer.c \
 	)
 
 OBJS = $(addprefix $(OBJDIR)/, $(notdir $(SRCS:.c=.o)))
 
 HDRS = $(addprefix inc/scpi/, \
 	scpi.h constants.h debug.h error.h \
-	fifo.h ieee488.h minimal.h parser.h \
-	types.h units.h \
-	) src/utils.h
+	ieee488.h minimal.h parser.h types.h units.h \
+	) \
+	$(addprefix src/, \
+	lexer_private.h utils_private.h fifo_private.h \
+	parser_private.h \
+	) \
 
 
 TESTS = $(addprefix test/, \
-	test_fifo.c test_scpi_utils.c \
+	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
 
 
 $(OBJDIR):
@@ -58,22 +54,12 @@
 $(DISTDIR)/$(STATICLIB): $(OBJS)
 	$(AR) $(STATICLIBFLAGS) $(DISTDIR)/$(STATICLIB) $(OBJS)
 
-$(DISTDIR)/$(SHAREDLIBVER): $(OBJS)
-	$(CC) $(SHAREDLIBFLAGS),$(SHAREDLIB) -o $(DISTDIR)/$(SHAREDLIBVER) $(OBJS)
-
-$(DISTDIR)/$(SHAREDLIB): $(DISTDIR)/$(SHAREDLIBVER)
-	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

--
Gitblit v1.9.1