Cleanup root directory

Per LMMS#2201
tresf · Jul 25, 2015 · 9cd2903 · 9cd2903
1 parent 403c365
commit 9cd2903
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 167 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -366,9 +366,9 @@ ENDIF(LMMS_BUILD_WIN32)
 PKG_CHECK_MODULES(SAMPLERATE REQUIRED samplerate>=0.1.8)
 
 
-CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/lmmsconfig.h.in" "${CMAKE_BINARY_DIR}/lmmsconfig.h")
-CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/lmmsversion.h.in" "${CMAKE_BINARY_DIR}/lmmsversion.h")
-CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/lmms.rc.in" "${CMAKE_BINARY_DIR}/lmms.rc")
+CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/src/lmmsconfig.h.in" "${CMAKE_BINARY_DIR}/lmmsconfig.h")
+CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/src/lmmsversion.h.in" "${CMAKE_BINARY_DIR}/lmmsversion.h")
+CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/data/lmms.rc.in" "${CMAKE_BINARY_DIR}/lmms.rc")
 CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc.in" "${CMAKE_BINARY_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc")
 
 # set compiler flags
@@ -455,8 +455,8 @@ ADD_SUBDIRECTORY(data)
 ADD_SUBDIRECTORY(doc)
 
 ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/lmms.1.gz"
-				COMMAND gzip -c "\"${CMAKE_SOURCE_DIR}/lmms.1\"" > "\"${CMAKE_BINARY_DIR}/lmms.1.gz\""
-				DEPENDS "${CMAKE_SOURCE_DIR}/lmms.1"
+				COMMAND gzip -c "\"${CMAKE_SOURCE_DIR}/doc/lmms.1\"" > "\"${CMAKE_BINARY_DIR}/lmms.1.gz\""
+				DEPENDS "${CMAKE_SOURCE_DIR}/doc/lmms.1"
 				COMMENT "Generating lmms.1.gz")
 
 ADD_CUSTOM_TARGET(manpage ALL
@@ -498,7 +498,7 @@ ADD_CUSTOM_TARGET(dist
 			COMMAND make clean
 			COMMAND rm -rf "${TMP}"
 			COMMAND mkdir -p "${TMP}"
-			COMMAND cp AUTHORS build_mingw32 build_mingw64 CMakeLists.txt configure COPYING INSTALL lmms.1 lmms.rc.in lmms.spec.in lmmsconfig.h.in lmmsversion.h.in README TODO "${TMP}"
+			COMMAND cp AUTHORS build_mingw32 build_mingw64 CMakeLists.txt configure COPYING INSTALL README TODO "${TMP}"
 			COMMAND cp -r buildtools cmake data doc include plugins src "${TMP}"
 			COMMAND rm -rf `find "${TMP}" -name cmake_install.cmake` `find "${TMP}" -name Makefile` `find "${TMP}" -type d -name CMakeFiles` "${TMP}/CMakeCache.txt"
 			COMMAND tar cjf lmms-${VERSION}-src.tar.bz2 "${TMP}"

diff --git a/INSTALL b/INSTALL
@@ -31,3 +31,18 @@ If you want to supply an install prefix to cmake, add the flag:
 
 Where <prefix> can be /usr, /usr/local, /opt, etc. The default is /usr/local.
 
+
+
+Building with QT5
+
+First of all please note that CMake >= 2.8.11 is required for building with
+Qt5 support. In order to build LMMS with Qt5, add the following flag when
+invoking cmake:
+
+-DWANT_QT5=ON
+
+If your Qt5 installation does not reside in standard installation paths,
+additionally pass e.g.
+
+-DCMAKE_PREFIX_PATH=/opt/qt53/
+
diff --git a/INSTALL.Qt5 b/INSTALL.Qt5
diff --git a/COPYING → LICENSE.txt b/COPYING → LICENSE.txt
diff --git a/README b/README
diff --git a/TODO b/TODO
diff --git a/build_mingw32 → cmake/scripts/build_mingw32 b/build_mingw32 → cmake/scripts/build_mingw32
diff --git a/build_mingw64 → cmake/scripts/build_mingw64 b/build_mingw64 → cmake/scripts/build_mingw64
diff --git a/configure b/configure
diff --git a/lmms.rc.in → data/lmms.rc.in b/lmms.rc.in → data/lmms.rc.in
diff --git a/lmms.spec.in → data/lmms.spec.in b/lmms.spec.in → data/lmms.spec.in
diff --git a/AUTHORS → doc/AUTHORS b/AUTHORS → doc/AUTHORS
diff --git a/lmms.1 → doc/lmms.1 b/lmms.1 → doc/lmms.1
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -31,7 +31,7 @@ IF(WIN32)
 				DEPENDS "${CMAKE_BINARY_DIR}/lmms.rc")
 ENDIF()
 
-SET(lmms_EMBEDDED_RESOURCES "${CMAKE_SOURCE_DIR}/AUTHORS" "${CMAKE_SOURCE_DIR}/COPYING" "${CONTRIBUTORS}")
+SET(lmms_EMBEDDED_RESOURCES "${CMAKE_SOURCE_DIR}/doc/AUTHORS" "${CMAKE_SOURCE_DIR}/LICENSE.txt" "${CONTRIBUTORS}")
 SET(LMMS_ER_H "${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h")
 ADD_CUSTOM_COMMAND(OUTPUT "${LMMS_ER_H}" COMMAND "${BIN2RES}" ARGS ${lmms_EMBEDDED_RESOURCES} > "\"${LMMS_ER_H}\"" DEPENDS bin2res)
 

diff --git a/lmmsconfig.h.in → src/lmmsconfig.h.in b/lmmsconfig.h.in → src/lmmsconfig.h.in
diff --git a/lmmsversion.h.in → src/lmmsversion.h.in b/lmmsversion.h.in → src/lmmsversion.h.in