From ad23a4ca641b09d2233741049623ac4afed206f7 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Fri, 2 Oct 2009 17:54:07 +0200 Subject: [PATCH] fix tag header and order build Signed-off-by: Julien Danjou --- CMakeLists.txt | 68 ++++++++++++++++++++++++------------------------ objects/button.h | 4 +-- objects/client.h | 4 +-- objects/image.h | 4 +-- objects/key.h | 4 +-- objects/tag.h | 4 +-- objects/timer.h | 4 +-- objects/wibox.h | 4 +-- objects/widget.h | 4 +-- 9 files changed, 50 insertions(+), 50 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 21a2cdb6..7998ec72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,49 +37,49 @@ set(AWE_DOC_FILES set(AWE_SRCS ${SOURCE_DIR}/awesome.c - ${SOURCE_DIR}/objects/client.c - ${SOURCE_DIR}/strut.c - ${SOURCE_DIR}/dbus.c - ${SOURCE_DIR}/root.c - ${SOURCE_DIR}/event.c - ${SOURCE_DIR}/property.c - ${SOURCE_DIR}/ewmh.c - ${SOURCE_DIR}/objects/key.c - ${SOURCE_DIR}/keygrabber.c - ${SOURCE_DIR}/mousegrabber.c ${SOURCE_DIR}/banning.c - ${SOURCE_DIR}/luaa.c - ${SOURCE_DIR}/spawn.c - ${SOURCE_DIR}/mouse.c - ${SOURCE_DIR}/objects/button.c - ${SOURCE_DIR}/screen.c - ${SOURCE_DIR}/stack.c - ${SOURCE_DIR}/selection.c - ${SOURCE_DIR}/objects/wibox.c - ${SOURCE_DIR}/systray.c - ${SOURCE_DIR}/objects/tag.c - ${SOURCE_DIR}/objects/widget.c - ${SOURCE_DIR}/xwindow.c - ${SOURCE_DIR}/objects/image.c - ${SOURCE_DIR}/draw.c - ${SOURCE_DIR}/font.c ${SOURCE_DIR}/color.c + ${SOURCE_DIR}/dbus.c + ${SOURCE_DIR}/draw.c + ${SOURCE_DIR}/event.c + ${SOURCE_DIR}/ewmh.c + ${SOURCE_DIR}/font.c + ${SOURCE_DIR}/keygrabber.c ${SOURCE_DIR}/keyresolv.c - ${SOURCE_DIR}/objects/timer.c - ${SOURCE_DIR}/objects/window.c - ${SOURCE_DIR}/common/buffer.c + ${SOURCE_DIR}/luaa.c + ${SOURCE_DIR}/mouse.c + ${SOURCE_DIR}/mousegrabber.c + ${SOURCE_DIR}/property.c + ${SOURCE_DIR}/root.c + ${SOURCE_DIR}/screen.c + ${SOURCE_DIR}/selection.c + ${SOURCE_DIR}/spawn.c + ${SOURCE_DIR}/stack.c + ${SOURCE_DIR}/strut.c + ${SOURCE_DIR}/systray.c + ${SOURCE_DIR}/xwindow.c ${SOURCE_DIR}/common/atoms.c + ${SOURCE_DIR}/common/backtrace.c + ${SOURCE_DIR}/common/buffer.c + ${SOURCE_DIR}/common/luaclass.c + ${SOURCE_DIR}/common/luaobject.c ${SOURCE_DIR}/common/util.c ${SOURCE_DIR}/common/version.c + ${SOURCE_DIR}/common/xcursor.c ${SOURCE_DIR}/common/xembed.c ${SOURCE_DIR}/common/xutil.c - ${SOURCE_DIR}/common/xcursor.c - ${SOURCE_DIR}/common/backtrace.c - ${SOURCE_DIR}/common/luaobject.c - ${SOURCE_DIR}/common/luaclass.c - ${SOURCE_DIR}/objects/widgets/textbox.c + ${SOURCE_DIR}/objects/button.c + ${SOURCE_DIR}/objects/client.c + ${SOURCE_DIR}/objects/image.c + ${SOURCE_DIR}/objects/key.c + ${SOURCE_DIR}/objects/tag.c + ${SOURCE_DIR}/objects/timer.c + ${SOURCE_DIR}/objects/wibox.c + ${SOURCE_DIR}/objects/window.c + ${SOURCE_DIR}/objects/widget.c + ${SOURCE_DIR}/objects/widgets/imagebox.c ${SOURCE_DIR}/objects/widgets/systray.c - ${SOURCE_DIR}/objects/widgets/imagebox.c) + ${SOURCE_DIR}/objects/widgets/textbox.c) set(AWE_MAN_SRCS ${SOURCE_DIR}/manpages/awesome.1.txt diff --git a/objects/button.h b/objects/button.h index 1ac1fe40..809d2001 100644 --- a/objects/button.h +++ b/objects/button.h @@ -19,8 +19,8 @@ * */ -#ifndef AWESOME_BUTTON_H -#define AWESOME_BUTTON_H +#ifndef AWESOME_OBJECTS_BUTTON_H +#define AWESOME_OBJECTS_BUTTON_H #include "globalconf.h" diff --git a/objects/client.h b/objects/client.h index edf06d37..2a07372d 100644 --- a/objects/client.h +++ b/objects/client.h @@ -19,8 +19,8 @@ * */ -#ifndef AWESOME_CLIENT_H -#define AWESOME_CLIENT_H +#ifndef AWESOME_OBJECTS_CLIENT_H +#define AWESOME_OBJECTS_CLIENT_H #include "mouse.h" #include "stack.h" diff --git a/objects/image.h b/objects/image.h index 2a9662e1..12c61927 100644 --- a/objects/image.h +++ b/objects/image.h @@ -19,8 +19,8 @@ * */ -#ifndef AWESOME_IMAGE_H -#define AWESOME_IMAGE_H +#ifndef AWESOME_OBJECTS_IMAGE_H +#define AWESOME_OBJECTS_IMAGE_H #include #include "common/luaclass.h" diff --git a/objects/key.h b/objects/key.h index 937f7e9d..506c0d2b 100644 --- a/objects/key.h +++ b/objects/key.h @@ -19,8 +19,8 @@ * */ -#ifndef AWESOME_KEY_H -#define AWESOME_KEY_H +#ifndef AWESOME_OBJECTS_KEY_H +#define AWESOME_OBJECTS_KEY_H #include "common/luaobject.h" diff --git a/objects/tag.h b/objects/tag.h index 0bd99d7f..1a823688 100644 --- a/objects/tag.h +++ b/objects/tag.h @@ -19,8 +19,8 @@ * */ -#ifndef AWESOME_TAG_H -#define AWESOME_TAG_H +#ifndef AWESOME_OBJECTS_TAG_H +#define AWESOME_OBJECTS_TAG_H #include "client.h" diff --git a/objects/timer.h b/objects/timer.h index ded85f64..4efdf135 100644 --- a/objects/timer.h +++ b/objects/timer.h @@ -19,8 +19,8 @@ * */ -#ifndef AWESOME_TIMER -#define AWESOME_TIMER +#ifndef AWESOME_OBJECTS_TIMER_H +#define AWESOME_OBJECTS_TIMER_H #include diff --git a/objects/wibox.h b/objects/wibox.h index 1134006f..12e24ae6 100644 --- a/objects/wibox.h +++ b/objects/wibox.h @@ -19,8 +19,8 @@ * */ -#ifndef AWESOME_WIBOX_H -#define AWESOME_WIBOX_H +#ifndef AWESOME_OBJECTS_WIBOX_H +#define AWESOME_OBJECTS_WIBOX_H #include "objects/widget.h" #include "objects/window.h" diff --git a/objects/widget.h b/objects/widget.h index cd4d60f6..7f715d66 100644 --- a/objects/widget.h +++ b/objects/widget.h @@ -19,8 +19,8 @@ * */ -#ifndef AWESOME_WIDGET_H -#define AWESOME_WIDGET_H +#ifndef AWESOME_OBJECTS_WIDGET_H +#define AWESOME_OBJECTS_WIDGET_H #include "button.h" #include "draw.h"