From 0cb7ce28d5dc0508d3eb2c1e52ff2fc555442d9a Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周六, 18 4月 2015 20:04:38 +0800
Subject: [PATCH] Correct avr-libc detection

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

diff --git a/libscpi/Makefile b/libscpi/Makefile
index 75caea6..62b20b5 100644
--- a/libscpi/Makefile
+++ b/libscpi/Makefile
@@ -1,9 +1,9 @@
 
-VERSION = 0.3.0
+VERSION = 2.0.0
 LIBNAME = scpi
 
 
-CFLAGS += -Wextra -O1 -g -fPIC -Iinc
+CFLAGS += -Wextra -g -fPIC -Iinc
 LDFLAGS += -Wl,--as-needed
 TESTFLAGS += -lcunit
 
@@ -11,14 +11,13 @@
 DISTDIR=dist
 TESTDIR=test
 
-STATICLIBFLAGS = rcs
-SHAREDLIBFLAGS = $(LDFLAGS) -shared -Wl,-soname
-
-
 STATICLIB = lib$(LIBNAME).a
 SHAREDLIB = lib$(LIBNAME).so
 
 SHAREDLIBVER = $(SHAREDLIB).$(VERSION)
+
+STATICLIBFLAGS = rcs
+SHAREDLIBFLAGS = $(LDFLAGS) -shared -Wl,-soname,$(SHAREDLIB)
 
 SRCS = $(addprefix src/, \
 	debug.c error.c fifo.c ieee488.c \
@@ -30,13 +29,16 @@
 
 HDRS = $(addprefix inc/scpi/, \
 	scpi.h constants.h debug.h error.h \
-	fifo.h ieee488.h minimal.h parser.h \
-	types.h units.h lexer.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_lexer_parser.c\
+	test_fifo.c test_scpi_utils.c test_lexer_parser.c test_parser.c\
 	)
 
 TESTS_OBJS = $(TESTS:.c=.o)
@@ -60,7 +62,7 @@
 	$(AR) $(STATICLIBFLAGS) $(DISTDIR)/$(STATICLIB) $(OBJS)
 
 $(DISTDIR)/$(SHAREDLIBVER): $(OBJS)
-	$(CC) $(SHAREDLIBFLAGS),$(SHAREDLIB) -o $(DISTDIR)/$(SHAREDLIBVER) $(OBJS)
+	$(CC) $(SHAREDLIBFLAGS) -o $(DISTDIR)/$(SHAREDLIBVER) $(OBJS)
 
 $(DISTDIR)/$(SHAREDLIB): $(DISTDIR)/$(SHAREDLIBVER)
 	$(RM) $(DISTDIR)/$(SHAREDLIB)

--
Gitblit v1.9.1