From 794a6e9f2e3e2ebefd9269772d35f7f3e9e21166 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 18 1月 2015 20:07:26 +0800
Subject: [PATCH] Refactoring token constants

---
 libscpi/Makefile |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/libscpi/Makefile b/libscpi/Makefile
index baa4567..90988ea 100644
--- a/libscpi/Makefile
+++ b/libscpi/Makefile
@@ -23,19 +23,23 @@
 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)
@@ -62,6 +66,7 @@
 	$(CC) $(SHAREDLIBFLAGS),$(SHAREDLIB) -o $(DISTDIR)/$(SHAREDLIBVER) $(OBJS)
 
 $(DISTDIR)/$(SHAREDLIB): $(DISTDIR)/$(SHAREDLIBVER)
+	$(RM) $(DISTDIR)/$(SHAREDLIB)
 	ln -s $(SHAREDLIBVER) $(DISTDIR)/$(SHAREDLIB)
 
 static: $(DISTDIR)/$(STATICLIB)
@@ -73,7 +78,6 @@
 
 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