From 57bf95cb42a2da2028c8c0fc354fd03065a89c9c Mon Sep 17 00:00:00 2001
From: Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
Date: Fri, 3 Apr 2009 17:02:52 +0200
Subject: [PATCH] Moved some DMDFE files into a seperate dmd/root subdir to
 closer match the DMD file structure since 1.041.

---
 CMakeLists.txt               | 4 +++-
 dmd/{ => root}/array.c       | 0
 dmd/{ => root}/dchar.c       | 0
 dmd/{ => root}/dchar.h       | 0
 dmd/{ => root}/gnuc.c        | 0
 dmd/{ => root}/gnuc.h        | 0
 dmd/{ => root}/lstring.c     | 0
 dmd/{ => root}/lstring.h     | 0
 dmd/{ => root}/man.c         | 0
 dmd/{ => root}/port.h        | 0
 dmd/{ => root}/root.c        | 0
 dmd/{ => root}/root.h        | 0
 dmd/{ => root}/stringtable.c | 0
 dmd/{ => root}/stringtable.h | 0
 14 files changed, 3 insertions(+), 1 deletion(-)
 rename dmd/{ => root}/array.c (100%)
 rename dmd/{ => root}/dchar.c (100%)
 rename dmd/{ => root}/dchar.h (100%)
 rename dmd/{ => root}/gnuc.c (100%)
 rename dmd/{ => root}/gnuc.h (100%)
 rename dmd/{ => root}/lstring.c (100%)
 rename dmd/{ => root}/lstring.h (100%)
 rename dmd/{ => root}/man.c (100%)
 rename dmd/{ => root}/port.h (100%)
 rename dmd/{ => root}/root.c (100%)
 rename dmd/{ => root}/root.h (100%)
 rename dmd/{ => root}/stringtable.c (100%)
 rename dmd/{ => root}/stringtable.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4938eeda..4afb1316 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,9 +131,10 @@ set(LDC_GENERATED
 set(DEFAULT_TARGET ${HOST_TARGET} CACHE STRING "default target")
 set(DEFAULT_ALT_TARGET ${HOST_ALT_TARGET} CACHE STRING "default alt target")
 
-include_directories(. ${DMDFE_PATH} ${PROJECT_BINARY_DIR}/${DMDFE_PATH} ${PROJECT_BINARY_DIR} ${LLVM_INSTDIR}/include)
+include_directories(. ${DMDFE_PATH} ${DMDFE_PATH}/root ${PROJECT_BINARY_DIR}/${DMDFE_PATH} ${PROJECT_BINARY_DIR} ${LLVM_INSTDIR}/include)
 
 file(GLOB FE_SRC ${DMDFE_PATH}/*.c)
+file(GLOB FE_SRC_ROOT ${DMDFE_PATH}/root/*.c)
 file(GLOB GEN_SRC gen/*.cpp)
 file(GLOB IR_SRC ir/*.cpp)
 # exclude idgen and impcnvgen and generated sources, just in case
@@ -146,6 +147,7 @@ list(REMOVE_ITEM FE_SRC
 set(LDC_SOURCE_FILES
 	${LDC_GENERATED}
 	${FE_SRC}
+	${FE_SRC_ROOT}
 	${GEN_SRC}
 	${IR_SRC}
 )
diff --git a/dmd/array.c b/dmd/root/array.c
similarity index 100%
rename from dmd/array.c
rename to dmd/root/array.c
diff --git a/dmd/dchar.c b/dmd/root/dchar.c
similarity index 100%
rename from dmd/dchar.c
rename to dmd/root/dchar.c
diff --git a/dmd/dchar.h b/dmd/root/dchar.h
similarity index 100%
rename from dmd/dchar.h
rename to dmd/root/dchar.h
diff --git a/dmd/gnuc.c b/dmd/root/gnuc.c
similarity index 100%
rename from dmd/gnuc.c
rename to dmd/root/gnuc.c
diff --git a/dmd/gnuc.h b/dmd/root/gnuc.h
similarity index 100%
rename from dmd/gnuc.h
rename to dmd/root/gnuc.h
diff --git a/dmd/lstring.c b/dmd/root/lstring.c
similarity index 100%
rename from dmd/lstring.c
rename to dmd/root/lstring.c
diff --git a/dmd/lstring.h b/dmd/root/lstring.h
similarity index 100%
rename from dmd/lstring.h
rename to dmd/root/lstring.h
diff --git a/dmd/man.c b/dmd/root/man.c
similarity index 100%
rename from dmd/man.c
rename to dmd/root/man.c
diff --git a/dmd/port.h b/dmd/root/port.h
similarity index 100%
rename from dmd/port.h
rename to dmd/root/port.h
diff --git a/dmd/root.c b/dmd/root/root.c
similarity index 100%
rename from dmd/root.c
rename to dmd/root/root.c
diff --git a/dmd/root.h b/dmd/root/root.h
similarity index 100%
rename from dmd/root.h
rename to dmd/root/root.h
diff --git a/dmd/stringtable.c b/dmd/root/stringtable.c
similarity index 100%
rename from dmd/stringtable.c
rename to dmd/root/stringtable.c
diff --git a/dmd/stringtable.h b/dmd/root/stringtable.h
similarity index 100%
rename from dmd/stringtable.h
rename to dmd/root/stringtable.h