From 30ea399f52a972f3fae7a06edf6edae710a8cf5e Mon Sep 17 00:00:00 2001
From: Michael Gehring <mg@ebfe.org>
Date: Fri, 20 Jun 2008 18:59:39 +0200
Subject: [PATCH] cmake: remove unnecessary variables

---
 CMakeLists.txt      | 50 ++++++++++++++++++++++-----------------------
 awesomeConfig.cmake |  4 ----
 2 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2facaf2a..779d2f98 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,34 +38,34 @@ SET(AWE_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/titlebar.c
     ${CMAKE_CURRENT_SOURCE_DIR}/widget.c
     ${CMAKE_CURRENT_SOURCE_DIR}/window.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_COMMON_DIR}/configopts.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_COMMON_DIR}/draw.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_COMMON_DIR}/markup.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_COMMON_DIR}/socket.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_COMMON_DIR}/swindow.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_COMMON_DIR}/util.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_COMMON_DIR}/version.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_COMMON_DIR}/xembed.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_COMMON_DIR}/xscreen.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_COMMON_DIR}/xutil.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_LAYOUT_DIR}/fibonacci.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_LAYOUT_DIR}/floating.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_LAYOUT_DIR}/magnifier.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_LAYOUT_DIR}/max.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_LAYOUT_DIR}/tile.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_WIDGET_DIR}/graph.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_WIDGET_DIR}/iconbox.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_WIDGET_DIR}/progressbar.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_WIDGET_DIR}/taglist.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_WIDGET_DIR}/tasklist.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_WIDGET_DIR}/textbox.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_WIDGET_DIR}/systray.c)
+    ${CMAKE_CURRENT_SOURCE_DIR}/common/configopts.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/common/draw.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/common/markup.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/common/socket.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/common/swindow.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/common/util.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/common/version.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/common/xembed.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/common/xscreen.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/common/xutil.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/layouts/fibonacci.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/layouts/floating.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/layouts/magnifier.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/layouts/max.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/layouts/tile.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/widgets/graph.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/widgets/iconbox.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/widgets/progressbar.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/widgets/taglist.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/widgets/tasklist.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/widgets/textbox.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/widgets/systray.c)
 
 SET(AWE_CLIENT_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/awesome-client.c 
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_COMMON_DIR}/socket.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_COMMON_DIR}/util.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${AWE_COMMON_DIR}/version.c)
+    ${CMAKE_CURRENT_SOURCE_DIR}/common/socket.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/common/util.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/common/version.c)
 
 SET(AWE_MAN_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/awesome.1.txt
diff --git a/awesomeConfig.cmake b/awesomeConfig.cmake
index c35bf3b2..60e43523 100644
--- a/awesomeConfig.cmake
+++ b/awesomeConfig.cmake
@@ -65,10 +65,6 @@ IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git/HEAD)
 ENDIF()
 
 
-SET(AWE_COMMON_DIR common)
-SET(AWE_LAYOUT_DIR layouts)
-SET(AWE_WIDGET_DIR widgets)
-
 # Use pkgconfig to get most of the libraries
 pkg_check_modules(AWE_MOD REQUIRED
     glib-2.0