mv cppcommo out of src

2025-07-18 00:00:12 +08:00 · 2013-09-10 00:25:35 +08:00 · 2013-09-10 00:25:35 +08:00 · 99f094c64b
commit 99f094c64b
parent aefbbdf49d
29 changed files with 10 additions and 12 deletions
--- a/src/cppcommon/Makefile
+++ b/src/cppcommon/Makefile
--- a/src/cppcommon/argv_functs.cpp
+++ b/src/cppcommon/argv_functs.cpp
--- a/src/cppcommon/argv_functs.h
+++ b/src/cppcommon/argv_functs.h
--- a/src/cppcommon/config.cpp
+++ b/src/cppcommon/config.cpp
--- a/src/cppcommon/config.h
+++ b/src/cppcommon/config.h
--- a/src/cppcommon/encoding.cpp
+++ b/src/cppcommon/encoding.cpp
--- a/src/cppcommon/encoding.h
+++ b/src/cppcommon/encoding.h
--- a/src/cppcommon/file_functs.cpp
+++ b/src/cppcommon/file_functs.cpp
--- a/src/cppcommon/file_functs.h
+++ b/src/cppcommon/file_functs.h
--- a/src/cppcommon/headers.h
+++ b/src/cppcommon/headers.h
--- a/src/cppcommon/io_functs.cpp
+++ b/src/cppcommon/io_functs.cpp
--- a/src/cppcommon/io_functs.h
+++ b/src/cppcommon/io_functs.h
--- a/src/cppcommon/logger.cpp
+++ b/src/cppcommon/logger.cpp
--- a/src/cppcommon/logger.h
+++ b/src/cppcommon/logger.h
--- a/src/cppcommon/map_functs.h
+++ b/src/cppcommon/map_functs.h
--- a/src/cppcommon/str_functs.cpp
+++ b/src/cppcommon/str_functs.cpp
--- a/src/cppcommon/str_functs.h
+++ b/src/cppcommon/str_functs.h
--- a/src/cppcommon/testdata/dict.gbk
+++ b/src/cppcommon/testdata/dict.gbk
--- a/src/cppcommon/testdata/dict.utf8
+++ b/src/cppcommon/testdata/dict.utf8
--- a/src/cppcommon/typedefs.h
+++ b/src/cppcommon/typedefs.h
--- a/src/cppcommon/vec_functs.cpp
+++ b/src/cppcommon/vec_functs.cpp
--- a/src/cppcommon/vec_functs.h
+++ b/src/cppcommon/vec_functs.h
--- a/src/cppcommon/vec_functs.tcc
+++ b/src/cppcommon/vec_functs.tcc
--- a/src/HMMSegment.h
+++ b/src/HMMSegment.h
@ -4,7 +4,7 @@
 #include <iostream>
 #include <fstream>
 #include <memory.h>
-#include "cppcommon/headers.h"
+#include "../cppcommon/headers.h"
 #include "globals.h"
 #include "TransCode.h"

--- a/src/Makefile
+++ b/src/Makefile
@ -2,8 +2,6 @@ CXX    := g++
 LD     := g++
 AR     := ar rc

-INCS := -I. -I./cppcommon
-
 DEBUG_CXXFLAGS     := -g -Wall -DDEBUG 
 RELEASE_CXXFLAGS   := -Wall -O3

@ -20,7 +18,7 @@ DOPACK := $(AR)
 SOURCES := $(wildcard *.cpp)
 OBJS := $(patsubst %.cpp,%.o,$(SOURCES))

-CMDIR := ./cppcommon
+CMDIR := ../cppcommon
 CMLIB := $(CMDIR)/libcm.a

 TMPDIR := ./cppjiebatmp
--- a/src/MixSegment.h
+++ b/src/MixSegment.h
@ -3,7 +3,7 @@

 #include "MPSegment.h"
 #include "HMMSegment.h"
-#include "cppcommon/headers.h"
+#include "../cppcommon/headers.h"

 namespace CppJieba
 {
--- a/src/TransCode.h
+++ b/src/TransCode.h
@ -7,8 +7,8 @@


 #include "globals.h"
-#include "cppcommon/str_functs.h"
-#include "cppcommon/vec_functs.h"
+#include "../cppcommon/str_functs.h"
+#include "../cppcommon/vec_functs.h"

 namespace CppJieba
 {
--- a/src/Trie.h
+++ b/src/Trie.h
@ -12,10 +12,10 @@
 #include <stdint.h>
 #include <cmath>
 #include <limits>
-#include "cppcommon/str_functs.h"
-#include "cppcommon/vec_functs.h"
-#include "cppcommon/file_functs.h"
-#include "cppcommon/logger.h"
+#include "../cppcommon/str_functs.h"
+#include "../cppcommon/vec_functs.h"
+#include "../cppcommon/file_functs.h"
+#include "../cppcommon/logger.h"
 #include "TransCode.h"
 #include "globals.h"
 #include "structs.h"
--- a/src/headers.h
+++ b/src/headers.h
@ -5,7 +5,7 @@
 #ifndef CPPJIEBA_HEADERS_H
 #define CPPJIEBA_HEADERS_H

-#include "cppcommon/headers.h"
+#include "../cppcommon/headers.h"
 #include "globals.h"
 #include "KeyWordExt.h"
 #include "MPSegment.h"