diff --git a/CMakeLists.txt b/CMakeLists.txt index 03e10da22..41e5c3d14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,6 @@ endif() include(awesomeConfig.cmake) include_directories( - ${SOURCE_DIR} ${BUILD_DIR} ${AWESOME_COMMON_REQUIRED_INCLUDE_DIRS} ${AWESOME_REQUIRED_INCLUDE_DIRS} @@ -36,45 +35,45 @@ set(AWE_DOC_FILES ${SOURCE_DIR}/LICENSE) set(AWE_SRCS - ${SOURCE_DIR}/awesome.c - ${SOURCE_DIR}/banning.c - ${SOURCE_DIR}/color.c - ${SOURCE_DIR}/dbus.c - ${SOURCE_DIR}/draw.c - ${SOURCE_DIR}/event.c - ${SOURCE_DIR}/ewmh.c - ${SOURCE_DIR}/keygrabber.c - ${SOURCE_DIR}/luaa.c - ${SOURCE_DIR}/mouse.c - ${SOURCE_DIR}/mousegrabber.c - ${SOURCE_DIR}/property.c - ${SOURCE_DIR}/root.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}/xkb.c - ${SOURCE_DIR}/common/atoms.c - ${SOURCE_DIR}/common/backtrace.c - ${SOURCE_DIR}/common/buffer.c - ${SOURCE_DIR}/common/luaclass.c - ${SOURCE_DIR}/common/lualib.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}/objects/button.c - ${SOURCE_DIR}/objects/client.c - ${SOURCE_DIR}/objects/drawable.c - ${SOURCE_DIR}/objects/drawin.c - ${SOURCE_DIR}/objects/key.c - ${SOURCE_DIR}/objects/screen.c - ${SOURCE_DIR}/objects/tag.c - ${SOURCE_DIR}/objects/window.c) + ${BUILD_DIR}/awesome.c + ${BUILD_DIR}/banning.c + ${BUILD_DIR}/color.c + ${BUILD_DIR}/dbus.c + ${BUILD_DIR}/draw.c + ${BUILD_DIR}/event.c + ${BUILD_DIR}/ewmh.c + ${BUILD_DIR}/keygrabber.c + ${BUILD_DIR}/luaa.c + ${BUILD_DIR}/mouse.c + ${BUILD_DIR}/mousegrabber.c + ${BUILD_DIR}/property.c + ${BUILD_DIR}/root.c + ${BUILD_DIR}/selection.c + ${BUILD_DIR}/spawn.c + ${BUILD_DIR}/stack.c + ${BUILD_DIR}/strut.c + ${BUILD_DIR}/systray.c + ${BUILD_DIR}/xwindow.c + ${BUILD_DIR}/xkb.c + ${BUILD_DIR}/common/atoms.c + ${BUILD_DIR}/common/backtrace.c + ${BUILD_DIR}/common/buffer.c + ${BUILD_DIR}/common/luaclass.c + ${BUILD_DIR}/common/lualib.c + ${BUILD_DIR}/common/luaobject.c + ${BUILD_DIR}/common/util.c + ${BUILD_DIR}/common/version.c + ${BUILD_DIR}/common/xcursor.c + ${BUILD_DIR}/common/xembed.c + ${BUILD_DIR}/common/xutil.c + ${BUILD_DIR}/objects/button.c + ${BUILD_DIR}/objects/client.c + ${BUILD_DIR}/objects/drawable.c + ${BUILD_DIR}/objects/drawin.c + ${BUILD_DIR}/objects/key.c + ${BUILD_DIR}/objects/screen.c + ${BUILD_DIR}/objects/tag.c + ${BUILD_DIR}/objects/window.c) set(AWE_MAN_SRCS ${SOURCE_DIR}/manpages/awesome.1.txt diff --git a/awesome-version-internal.h.in b/awesome-version-internal.h similarity index 100% rename from awesome-version-internal.h.in rename to awesome-version-internal.h diff --git a/awesomeConfig.cmake b/awesomeConfig.cmake index 3a64a706c..7a391b11d 100644 --- a/awesomeConfig.cmake +++ b/awesomeConfig.cmake @@ -277,31 +277,44 @@ set(AWESOME_THEMES_PATH ${AWESOME_DATA_PATH}/themes) # }}} # {{{ Configure files +file(GLOB_RECURSE awesome_c_configure_files RELATIVE + ${SOURCE_DIR} + ${SOURCE_DIR}/*.c + ${SOURCE_DIR}/*.h + ${SOURCE_DIR}/*/*.c + ${SOURCE_DIR}/*/*.h) file(GLOB_RECURSE awesome_lua_configure_files RELATIVE ${SOURCE_DIR} - ${SOURCE_DIR}/lib/*.lua.in - ${SOURCE_DIR}/docs/capi/*.lua.in - ${SOURCE_DIR}/docs/*.md - ${SOURCE_DIR}/themes/*/*.lua.in) + ${SOURCE_DIR}/lib/*.lua + ${SOURCE_DIR}/themes/*/*.lua) set(AWESOME_CONFIGURE_FILES ${awesome_lua_configure_files} - config.h.in - docs/config.ld.in - awesomerc.lua.in - awesome-version-internal.h.in) - -macro(a_configure_file file) - string(REGEX REPLACE ".in\$" "" outfile ${file}) - message(STATUS "Configuring ${outfile}") - configure_file(${SOURCE_DIR}/${file} - ${BUILD_DIR}/${outfile} - ESCAPE_QUOTE - @ONLY) -endmacro() + config.h + docs/config.ld + awesomerc.lua + awesome-version-internal.h) foreach(file ${AWESOME_CONFIGURE_FILES}) - a_configure_file(${file}) + configure_file(${SOURCE_DIR}/${file} + ${BUILD_DIR}/${file} + ESCAPE_QUOTE + @ONLY) endforeach() #}}} +# {{{ Copy additional files +file(GLOB_RECURSE awesome_md_docs RELATIVE + ${SOURCE_DIR} + ${SOURCE_DIR}/docs/*.md) +set(AWESOME_ADDITIONAL_FILES + ${awesome_md_docs}) + +foreach(file ${AWESOME_ADDITIONAL_FILES}) + configure_file(${SOURCE_DIR}/${file} + ${BUILD_DIR}/${file} + COPYONLY) +endforeach() +#}}} + + # vim: filetype=cmake:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80:foldmethod=marker diff --git a/awesomerc.lua.in b/awesomerc.lua similarity index 100% rename from awesomerc.lua.in rename to awesomerc.lua diff --git a/config.h.in b/config.h similarity index 100% rename from config.h.in rename to config.h diff --git a/docs/config.ld.in b/docs/config.ld similarity index 100% rename from docs/config.ld.in rename to docs/config.ld diff --git a/lib/awful/autofocus.lua.in b/lib/awful/autofocus.lua similarity index 100% rename from lib/awful/autofocus.lua.in rename to lib/awful/autofocus.lua diff --git a/lib/awful/button.lua.in b/lib/awful/button.lua similarity index 100% rename from lib/awful/button.lua.in rename to lib/awful/button.lua diff --git a/lib/awful/client.lua.in b/lib/awful/client.lua similarity index 100% rename from lib/awful/client.lua.in rename to lib/awful/client.lua diff --git a/lib/awful/client/shape.lua.in b/lib/awful/client/shape.lua similarity index 100% rename from lib/awful/client/shape.lua.in rename to lib/awful/client/shape.lua diff --git a/lib/awful/completion.lua.in b/lib/awful/completion.lua similarity index 100% rename from lib/awful/completion.lua.in rename to lib/awful/completion.lua diff --git a/lib/awful/dbus.lua.in b/lib/awful/dbus.lua similarity index 100% rename from lib/awful/dbus.lua.in rename to lib/awful/dbus.lua diff --git a/lib/awful/ewmh.lua.in b/lib/awful/ewmh.lua similarity index 100% rename from lib/awful/ewmh.lua.in rename to lib/awful/ewmh.lua diff --git a/lib/awful/init.lua.in b/lib/awful/init.lua similarity index 100% rename from lib/awful/init.lua.in rename to lib/awful/init.lua diff --git a/lib/awful/key.lua.in b/lib/awful/key.lua similarity index 100% rename from lib/awful/key.lua.in rename to lib/awful/key.lua diff --git a/lib/awful/keygrabber.lua.in b/lib/awful/keygrabber.lua similarity index 100% rename from lib/awful/keygrabber.lua.in rename to lib/awful/keygrabber.lua diff --git a/lib/awful/layout/init.lua.in b/lib/awful/layout/init.lua similarity index 100% rename from lib/awful/layout/init.lua.in rename to lib/awful/layout/init.lua diff --git a/lib/awful/layout/suit/fair.lua.in b/lib/awful/layout/suit/fair.lua similarity index 100% rename from lib/awful/layout/suit/fair.lua.in rename to lib/awful/layout/suit/fair.lua diff --git a/lib/awful/layout/suit/floating.lua.in b/lib/awful/layout/suit/floating.lua similarity index 100% rename from lib/awful/layout/suit/floating.lua.in rename to lib/awful/layout/suit/floating.lua diff --git a/lib/awful/layout/suit/init.lua.in b/lib/awful/layout/suit/init.lua similarity index 100% rename from lib/awful/layout/suit/init.lua.in rename to lib/awful/layout/suit/init.lua diff --git a/lib/awful/layout/suit/magnifier.lua.in b/lib/awful/layout/suit/magnifier.lua similarity index 100% rename from lib/awful/layout/suit/magnifier.lua.in rename to lib/awful/layout/suit/magnifier.lua diff --git a/lib/awful/layout/suit/max.lua.in b/lib/awful/layout/suit/max.lua similarity index 100% rename from lib/awful/layout/suit/max.lua.in rename to lib/awful/layout/suit/max.lua diff --git a/lib/awful/layout/suit/spiral.lua.in b/lib/awful/layout/suit/spiral.lua similarity index 100% rename from lib/awful/layout/suit/spiral.lua.in rename to lib/awful/layout/suit/spiral.lua diff --git a/lib/awful/layout/suit/tile.lua.in b/lib/awful/layout/suit/tile.lua similarity index 100% rename from lib/awful/layout/suit/tile.lua.in rename to lib/awful/layout/suit/tile.lua diff --git a/lib/awful/menu.lua.in b/lib/awful/menu.lua similarity index 100% rename from lib/awful/menu.lua.in rename to lib/awful/menu.lua diff --git a/lib/awful/mouse/finder.lua.in b/lib/awful/mouse/finder.lua similarity index 100% rename from lib/awful/mouse/finder.lua.in rename to lib/awful/mouse/finder.lua diff --git a/lib/awful/mouse/init.lua.in b/lib/awful/mouse/init.lua similarity index 100% rename from lib/awful/mouse/init.lua.in rename to lib/awful/mouse/init.lua diff --git a/lib/awful/placement.lua.in b/lib/awful/placement.lua similarity index 100% rename from lib/awful/placement.lua.in rename to lib/awful/placement.lua diff --git a/lib/awful/prompt.lua.in b/lib/awful/prompt.lua similarity index 100% rename from lib/awful/prompt.lua.in rename to lib/awful/prompt.lua diff --git a/lib/awful/remote.lua.in b/lib/awful/remote.lua similarity index 100% rename from lib/awful/remote.lua.in rename to lib/awful/remote.lua diff --git a/lib/awful/rules.lua.in b/lib/awful/rules.lua similarity index 100% rename from lib/awful/rules.lua.in rename to lib/awful/rules.lua diff --git a/lib/awful/screen.lua.in b/lib/awful/screen.lua similarity index 100% rename from lib/awful/screen.lua.in rename to lib/awful/screen.lua diff --git a/lib/awful/startup_notification.lua.in b/lib/awful/startup_notification.lua similarity index 100% rename from lib/awful/startup_notification.lua.in rename to lib/awful/startup_notification.lua diff --git a/lib/awful/tag.lua.in b/lib/awful/tag.lua similarity index 100% rename from lib/awful/tag.lua.in rename to lib/awful/tag.lua diff --git a/lib/awful/titlebar.lua.in b/lib/awful/titlebar.lua similarity index 100% rename from lib/awful/titlebar.lua.in rename to lib/awful/titlebar.lua diff --git a/lib/awful/tooltip.lua.in b/lib/awful/tooltip.lua similarity index 100% rename from lib/awful/tooltip.lua.in rename to lib/awful/tooltip.lua diff --git a/lib/awful/util.lua.in b/lib/awful/util.lua similarity index 100% rename from lib/awful/util.lua.in rename to lib/awful/util.lua diff --git a/lib/awful/wibox.lua.in b/lib/awful/wibox.lua similarity index 100% rename from lib/awful/wibox.lua.in rename to lib/awful/wibox.lua diff --git a/lib/awful/widget/button.lua.in b/lib/awful/widget/button.lua similarity index 100% rename from lib/awful/widget/button.lua.in rename to lib/awful/widget/button.lua diff --git a/lib/awful/widget/common.lua.in b/lib/awful/widget/common.lua similarity index 100% rename from lib/awful/widget/common.lua.in rename to lib/awful/widget/common.lua diff --git a/lib/awful/widget/graph.lua.in b/lib/awful/widget/graph.lua similarity index 100% rename from lib/awful/widget/graph.lua.in rename to lib/awful/widget/graph.lua diff --git a/lib/awful/widget/init.lua.in b/lib/awful/widget/init.lua similarity index 100% rename from lib/awful/widget/init.lua.in rename to lib/awful/widget/init.lua diff --git a/lib/awful/widget/launcher.lua.in b/lib/awful/widget/launcher.lua similarity index 100% rename from lib/awful/widget/launcher.lua.in rename to lib/awful/widget/launcher.lua diff --git a/lib/awful/widget/layoutbox.lua.in b/lib/awful/widget/layoutbox.lua similarity index 100% rename from lib/awful/widget/layoutbox.lua.in rename to lib/awful/widget/layoutbox.lua diff --git a/lib/awful/widget/progressbar.lua.in b/lib/awful/widget/progressbar.lua similarity index 100% rename from lib/awful/widget/progressbar.lua.in rename to lib/awful/widget/progressbar.lua diff --git a/lib/awful/widget/prompt.lua.in b/lib/awful/widget/prompt.lua similarity index 100% rename from lib/awful/widget/prompt.lua.in rename to lib/awful/widget/prompt.lua diff --git a/lib/awful/widget/taglist.lua.in b/lib/awful/widget/taglist.lua similarity index 100% rename from lib/awful/widget/taglist.lua.in rename to lib/awful/widget/taglist.lua diff --git a/lib/awful/widget/tasklist.lua.in b/lib/awful/widget/tasklist.lua similarity index 100% rename from lib/awful/widget/tasklist.lua.in rename to lib/awful/widget/tasklist.lua diff --git a/lib/awful/widget/textclock.lua.in b/lib/awful/widget/textclock.lua similarity index 100% rename from lib/awful/widget/textclock.lua.in rename to lib/awful/widget/textclock.lua diff --git a/lib/beautiful.lua.in b/lib/beautiful.lua similarity index 100% rename from lib/beautiful.lua.in rename to lib/beautiful.lua diff --git a/lib/gears/color.lua.in b/lib/gears/color.lua similarity index 100% rename from lib/gears/color.lua.in rename to lib/gears/color.lua diff --git a/lib/gears/debug.lua.in b/lib/gears/debug.lua similarity index 100% rename from lib/gears/debug.lua.in rename to lib/gears/debug.lua diff --git a/lib/gears/init.lua.in b/lib/gears/init.lua similarity index 100% rename from lib/gears/init.lua.in rename to lib/gears/init.lua diff --git a/lib/gears/object.lua.in b/lib/gears/object.lua similarity index 100% rename from lib/gears/object.lua.in rename to lib/gears/object.lua diff --git a/lib/gears/sort.lua.in b/lib/gears/sort.lua similarity index 100% rename from lib/gears/sort.lua.in rename to lib/gears/sort.lua diff --git a/lib/gears/surface.lua.in b/lib/gears/surface.lua similarity index 100% rename from lib/gears/surface.lua.in rename to lib/gears/surface.lua diff --git a/lib/gears/timer.lua.in b/lib/gears/timer.lua similarity index 100% rename from lib/gears/timer.lua.in rename to lib/gears/timer.lua diff --git a/lib/gears/wallpaper.lua.in b/lib/gears/wallpaper.lua similarity index 100% rename from lib/gears/wallpaper.lua.in rename to lib/gears/wallpaper.lua diff --git a/lib/menubar/init.lua.in b/lib/menubar/init.lua similarity index 100% rename from lib/menubar/init.lua.in rename to lib/menubar/init.lua diff --git a/lib/menubar/menu_gen.lua.in b/lib/menubar/menu_gen.lua similarity index 100% rename from lib/menubar/menu_gen.lua.in rename to lib/menubar/menu_gen.lua diff --git a/lib/menubar/utils.lua.in b/lib/menubar/utils.lua similarity index 100% rename from lib/menubar/utils.lua.in rename to lib/menubar/utils.lua diff --git a/lib/naughty/core.lua.in b/lib/naughty/core.lua similarity index 100% rename from lib/naughty/core.lua.in rename to lib/naughty/core.lua diff --git a/lib/naughty/dbus.lua.in b/lib/naughty/dbus.lua similarity index 100% rename from lib/naughty/dbus.lua.in rename to lib/naughty/dbus.lua diff --git a/lib/naughty/init.lua.in b/lib/naughty/init.lua similarity index 100% rename from lib/naughty/init.lua.in rename to lib/naughty/init.lua diff --git a/lib/wibox/drawable.lua.in b/lib/wibox/drawable.lua similarity index 100% rename from lib/wibox/drawable.lua.in rename to lib/wibox/drawable.lua diff --git a/lib/wibox/init.lua.in b/lib/wibox/init.lua similarity index 100% rename from lib/wibox/init.lua.in rename to lib/wibox/init.lua diff --git a/lib/wibox/layout/align.lua.in b/lib/wibox/layout/align.lua similarity index 100% rename from lib/wibox/layout/align.lua.in rename to lib/wibox/layout/align.lua diff --git a/lib/wibox/layout/base.lua.in b/lib/wibox/layout/base.lua similarity index 100% rename from lib/wibox/layout/base.lua.in rename to lib/wibox/layout/base.lua diff --git a/lib/wibox/layout/constraint.lua.in b/lib/wibox/layout/constraint.lua similarity index 100% rename from lib/wibox/layout/constraint.lua.in rename to lib/wibox/layout/constraint.lua diff --git a/lib/wibox/layout/fixed.lua.in b/lib/wibox/layout/fixed.lua similarity index 100% rename from lib/wibox/layout/fixed.lua.in rename to lib/wibox/layout/fixed.lua diff --git a/lib/wibox/layout/flex.lua.in b/lib/wibox/layout/flex.lua similarity index 100% rename from lib/wibox/layout/flex.lua.in rename to lib/wibox/layout/flex.lua diff --git a/lib/wibox/layout/init.lua.in b/lib/wibox/layout/init.lua similarity index 100% rename from lib/wibox/layout/init.lua.in rename to lib/wibox/layout/init.lua diff --git a/lib/wibox/layout/margin.lua.in b/lib/wibox/layout/margin.lua similarity index 100% rename from lib/wibox/layout/margin.lua.in rename to lib/wibox/layout/margin.lua diff --git a/lib/wibox/layout/mirror.lua.in b/lib/wibox/layout/mirror.lua similarity index 100% rename from lib/wibox/layout/mirror.lua.in rename to lib/wibox/layout/mirror.lua diff --git a/lib/wibox/layout/rotate.lua.in b/lib/wibox/layout/rotate.lua similarity index 100% rename from lib/wibox/layout/rotate.lua.in rename to lib/wibox/layout/rotate.lua diff --git a/lib/wibox/widget/background.lua.in b/lib/wibox/widget/background.lua similarity index 100% rename from lib/wibox/widget/background.lua.in rename to lib/wibox/widget/background.lua diff --git a/lib/wibox/widget/base.lua.in b/lib/wibox/widget/base.lua similarity index 100% rename from lib/wibox/widget/base.lua.in rename to lib/wibox/widget/base.lua diff --git a/lib/wibox/widget/imagebox.lua.in b/lib/wibox/widget/imagebox.lua similarity index 100% rename from lib/wibox/widget/imagebox.lua.in rename to lib/wibox/widget/imagebox.lua diff --git a/lib/wibox/widget/init.lua.in b/lib/wibox/widget/init.lua similarity index 100% rename from lib/wibox/widget/init.lua.in rename to lib/wibox/widget/init.lua diff --git a/lib/wibox/widget/systray.lua.in b/lib/wibox/widget/systray.lua similarity index 100% rename from lib/wibox/widget/systray.lua.in rename to lib/wibox/widget/systray.lua diff --git a/lib/wibox/widget/textbox.lua.in b/lib/wibox/widget/textbox.lua similarity index 100% rename from lib/wibox/widget/textbox.lua.in rename to lib/wibox/widget/textbox.lua diff --git a/themes/default/theme.lua.in b/themes/default/theme.lua similarity index 100% rename from themes/default/theme.lua.in rename to themes/default/theme.lua diff --git a/themes/sky/theme.lua.in b/themes/sky/theme.lua similarity index 100% rename from themes/sky/theme.lua.in rename to themes/sky/theme.lua diff --git a/themes/zenburn/theme.lua.in b/themes/zenburn/theme.lua similarity index 100% rename from themes/zenburn/theme.lua.in rename to themes/zenburn/theme.lua