From 99f094c64b6fae089280f0dc1075bf5a7bad7b4e Mon Sep 17 00:00:00 2001 From: wyy Date: Tue, 10 Sep 2013 00:25:35 +0800 Subject: [PATCH] mv cppcommo out of src --- {src/cppcommon => cppcommon}/Makefile | 0 {src/cppcommon => cppcommon}/argv_functs.cpp | 0 {src/cppcommon => cppcommon}/argv_functs.h | 0 {src/cppcommon => cppcommon}/config.cpp | 0 {src/cppcommon => cppcommon}/config.h | 0 {src/cppcommon => cppcommon}/encoding.cpp | 0 {src/cppcommon => cppcommon}/encoding.h | 0 {src/cppcommon => cppcommon}/file_functs.cpp | 0 {src/cppcommon => cppcommon}/file_functs.h | 0 {src/cppcommon => cppcommon}/headers.h | 0 {src/cppcommon => cppcommon}/io_functs.cpp | 0 {src/cppcommon => cppcommon}/io_functs.h | 0 {src/cppcommon => cppcommon}/logger.cpp | 0 {src/cppcommon => cppcommon}/logger.h | 0 {src/cppcommon => cppcommon}/map_functs.h | 0 {src/cppcommon => cppcommon}/str_functs.cpp | 0 {src/cppcommon => cppcommon}/str_functs.h | 0 {src/cppcommon => cppcommon}/testdata/dict.gbk | 0 {src/cppcommon => cppcommon}/testdata/dict.utf8 | 0 {src/cppcommon => cppcommon}/typedefs.h | 0 {src/cppcommon => cppcommon}/vec_functs.cpp | 0 {src/cppcommon => cppcommon}/vec_functs.h | 0 {src/cppcommon => cppcommon}/vec_functs.tcc | 0 src/HMMSegment.h | 2 +- src/Makefile | 4 +--- src/MixSegment.h | 2 +- src/TransCode.h | 4 ++-- src/Trie.h | 8 ++++---- src/headers.h | 2 +- 29 files changed, 10 insertions(+), 12 deletions(-) rename {src/cppcommon => cppcommon}/Makefile (100%) rename {src/cppcommon => cppcommon}/argv_functs.cpp (100%) rename {src/cppcommon => cppcommon}/argv_functs.h (100%) rename {src/cppcommon => cppcommon}/config.cpp (100%) rename {src/cppcommon => cppcommon}/config.h (100%) rename {src/cppcommon => cppcommon}/encoding.cpp (100%) rename {src/cppcommon => cppcommon}/encoding.h (100%) rename {src/cppcommon => cppcommon}/file_functs.cpp (100%) rename {src/cppcommon => cppcommon}/file_functs.h (100%) rename {src/cppcommon => cppcommon}/headers.h (100%) rename {src/cppcommon => cppcommon}/io_functs.cpp (100%) rename {src/cppcommon => cppcommon}/io_functs.h (100%) rename {src/cppcommon => cppcommon}/logger.cpp (100%) rename {src/cppcommon => cppcommon}/logger.h (100%) rename {src/cppcommon => cppcommon}/map_functs.h (100%) rename {src/cppcommon => cppcommon}/str_functs.cpp (100%) rename {src/cppcommon => cppcommon}/str_functs.h (100%) rename {src/cppcommon => cppcommon}/testdata/dict.gbk (100%) rename {src/cppcommon => cppcommon}/testdata/dict.utf8 (100%) rename {src/cppcommon => cppcommon}/typedefs.h (100%) rename {src/cppcommon => cppcommon}/vec_functs.cpp (100%) rename {src/cppcommon => cppcommon}/vec_functs.h (100%) rename {src/cppcommon => cppcommon}/vec_functs.tcc (100%) diff --git a/src/cppcommon/Makefile b/cppcommon/Makefile similarity index 100% rename from src/cppcommon/Makefile rename to cppcommon/Makefile diff --git a/src/cppcommon/argv_functs.cpp b/cppcommon/argv_functs.cpp similarity index 100% rename from src/cppcommon/argv_functs.cpp rename to cppcommon/argv_functs.cpp diff --git a/src/cppcommon/argv_functs.h b/cppcommon/argv_functs.h similarity index 100% rename from src/cppcommon/argv_functs.h rename to cppcommon/argv_functs.h diff --git a/src/cppcommon/config.cpp b/cppcommon/config.cpp similarity index 100% rename from src/cppcommon/config.cpp rename to cppcommon/config.cpp diff --git a/src/cppcommon/config.h b/cppcommon/config.h similarity index 100% rename from src/cppcommon/config.h rename to cppcommon/config.h diff --git a/src/cppcommon/encoding.cpp b/cppcommon/encoding.cpp similarity index 100% rename from src/cppcommon/encoding.cpp rename to cppcommon/encoding.cpp diff --git a/src/cppcommon/encoding.h b/cppcommon/encoding.h similarity index 100% rename from src/cppcommon/encoding.h rename to cppcommon/encoding.h diff --git a/src/cppcommon/file_functs.cpp b/cppcommon/file_functs.cpp similarity index 100% rename from src/cppcommon/file_functs.cpp rename to cppcommon/file_functs.cpp diff --git a/src/cppcommon/file_functs.h b/cppcommon/file_functs.h similarity index 100% rename from src/cppcommon/file_functs.h rename to cppcommon/file_functs.h diff --git a/src/cppcommon/headers.h b/cppcommon/headers.h similarity index 100% rename from src/cppcommon/headers.h rename to cppcommon/headers.h diff --git a/src/cppcommon/io_functs.cpp b/cppcommon/io_functs.cpp similarity index 100% rename from src/cppcommon/io_functs.cpp rename to cppcommon/io_functs.cpp diff --git a/src/cppcommon/io_functs.h b/cppcommon/io_functs.h similarity index 100% rename from src/cppcommon/io_functs.h rename to cppcommon/io_functs.h diff --git a/src/cppcommon/logger.cpp b/cppcommon/logger.cpp similarity index 100% rename from src/cppcommon/logger.cpp rename to cppcommon/logger.cpp diff --git a/src/cppcommon/logger.h b/cppcommon/logger.h similarity index 100% rename from src/cppcommon/logger.h rename to cppcommon/logger.h diff --git a/src/cppcommon/map_functs.h b/cppcommon/map_functs.h similarity index 100% rename from src/cppcommon/map_functs.h rename to cppcommon/map_functs.h diff --git a/src/cppcommon/str_functs.cpp b/cppcommon/str_functs.cpp similarity index 100% rename from src/cppcommon/str_functs.cpp rename to cppcommon/str_functs.cpp diff --git a/src/cppcommon/str_functs.h b/cppcommon/str_functs.h similarity index 100% rename from src/cppcommon/str_functs.h rename to cppcommon/str_functs.h diff --git a/src/cppcommon/testdata/dict.gbk b/cppcommon/testdata/dict.gbk similarity index 100% rename from src/cppcommon/testdata/dict.gbk rename to cppcommon/testdata/dict.gbk diff --git a/src/cppcommon/testdata/dict.utf8 b/cppcommon/testdata/dict.utf8 similarity index 100% rename from src/cppcommon/testdata/dict.utf8 rename to cppcommon/testdata/dict.utf8 diff --git a/src/cppcommon/typedefs.h b/cppcommon/typedefs.h similarity index 100% rename from src/cppcommon/typedefs.h rename to cppcommon/typedefs.h diff --git a/src/cppcommon/vec_functs.cpp b/cppcommon/vec_functs.cpp similarity index 100% rename from src/cppcommon/vec_functs.cpp rename to cppcommon/vec_functs.cpp diff --git a/src/cppcommon/vec_functs.h b/cppcommon/vec_functs.h similarity index 100% rename from src/cppcommon/vec_functs.h rename to cppcommon/vec_functs.h diff --git a/src/cppcommon/vec_functs.tcc b/cppcommon/vec_functs.tcc similarity index 100% rename from src/cppcommon/vec_functs.tcc rename to cppcommon/vec_functs.tcc diff --git a/src/HMMSegment.h b/src/HMMSegment.h index a68661b..845628b 100644 --- a/src/HMMSegment.h +++ b/src/HMMSegment.h @@ -4,7 +4,7 @@ #include #include #include -#include "cppcommon/headers.h" +#include "../cppcommon/headers.h" #include "globals.h" #include "TransCode.h" diff --git a/src/Makefile b/src/Makefile index fbfaafe..a64d354 100644 --- 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 diff --git a/src/MixSegment.h b/src/MixSegment.h index f2843d5..699f05c 100644 --- 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 { diff --git a/src/TransCode.h b/src/TransCode.h index 817aa79..0c5d39a 100644 --- 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 { diff --git a/src/Trie.h b/src/Trie.h index ea74882..7fa92f7 100644 --- a/src/Trie.h +++ b/src/Trie.h @@ -12,10 +12,10 @@ #include #include #include -#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" diff --git a/src/headers.h b/src/headers.h index 437052f..442fbdc 100644 --- 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"