diff options
author | Mathias Gumz <akira at fluxbox dot org> | 2013-02-13 09:50:05 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2013-02-13 09:50:25 (GMT) |
commit | 59f59801fcad89ae52498804ab7812bc33d58000 (patch) | |
tree | cbb0a931916199288a68456207decb4c5d407dc3 /src | |
parent | 7c26156842418c7aa82cf5c85d573fa049f19a54 (diff) | |
download | fluxbox-59f59801fcad89ae52498804ab7812bc33d58000.zip fluxbox-59f59801fcad89ae52498804ab7812bc33d58000.tar.bz2 |
Fix missing LogicCommands
By removing FbTk/LogicCommands.o from LDADD in src/Makefile.am (commit
06655f6) I prevented the linker to pick up FbTk/LogicCommands.o and thus
rendered all logic-commands useless.
Using a small helper object to pull in the dependency fixes this problem
without relying on manually tweaking the build system.
Diffstat (limited to 'src')
-rw-r--r-- | src/Keys.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/Keys.cc b/src/Keys.cc index c4ad5ea..388ec52 100644 --- a/src/Keys.cc +++ b/src/Keys.cc | |||
@@ -35,6 +35,7 @@ | |||
35 | #include "FbTk/RefCount.hh" | 35 | #include "FbTk/RefCount.hh" |
36 | #include "FbTk/KeyUtil.hh" | 36 | #include "FbTk/KeyUtil.hh" |
37 | #include "FbTk/CommandParser.hh" | 37 | #include "FbTk/CommandParser.hh" |
38 | #include "FbTk/LogicCommands.hh" | ||
38 | #include "FbTk/I18n.hh" | 39 | #include "FbTk/I18n.hh" |
39 | #include "FbTk/AutoReloadHelper.hh" | 40 | #include "FbTk/AutoReloadHelper.hh" |
40 | #include "FbTk/STLUtil.hh" | 41 | #include "FbTk/STLUtil.hh" |
@@ -109,6 +110,11 @@ using FbTk::STLUtil::destroyAndClearSecond; | |||
109 | 110 | ||
110 | namespace { | 111 | namespace { |
111 | 112 | ||
113 | // enforces the linking of FbTk/LogicCommands | ||
114 | FbTk::Command<void>* link_helper = FbTk::IfCommand::parse("", "", false); | ||
115 | |||
116 | |||
117 | |||
112 | // candidate for FbTk::StringUtil ? | 118 | // candidate for FbTk::StringUtil ? |
113 | int extractKeyFromString(const std::string& in, const char* start_pattern, unsigned int& key) { | 119 | int extractKeyFromString(const std::string& in, const char* start_pattern, unsigned int& key) { |
114 | 120 | ||