3 files changed, 11 insertions, 16 deletions
diff --git a/Slimber/CLI/Makefile.inc b/Slimber/CLI/Makefile.inc
deleted file mode 100644
index 974b835..0000000
--- a/Slimber/CLI/Makefile.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SLIMBER_CLI_TARGET = Slimber/CLI/slimber
-SLIMBER_CLI_SOURCES = \
-	Slimber/CLI/main.cpp
-SLIMBER_CLI_OBJECTS = \
-	$(SLIMBER_CLI_SOURCES:.cpp=.o)
-
-$(SLIMBER_CLI_TARGET): $(SWIFTEN_TARGET) $(SLIMBER_TARGET) $(SLIMBER_CLI_OBJECTS)
-	$(QUIET_LINK)$(CXX) -o $(SLIMBER_CLI_TARGET) $(SLIMBER_CLI_OBJECTS) $(LDFLAGS) $(SLIMBER_TARGET) $(SWIFTEN_TARGET) $(LIBS)
-
-#TARGETS += $(SLIMBER_CLI_TARGET)
-SLIMBER_TARGETS += $(SLIMBER_CLI_TARGET)
-CLEANFILES += \
-	$(SLIMBER_CLI_TARGET)
-DEPS += \
-	$(SLIMBER_CLI_SOURCES:.cpp=.dep) \
diff --git a/Slimber/CLI/SConscript b/Slimber/CLI/SConscript
new file mode 100644
index 0000000..b65843d
--- /dev/null
+++ b/Slimber/CLI/SConscript
@@ -0,0 +1,8 @@
+Import("env")
+
+myenv = env.Clone()
+myenv.MergeFlags(env["SLIMBER_FLAGS"])
+myenv.MergeFlags(env["SWIFTEN_FLAGS"])
+myenv.MergeFlags(env["BOOST_FLAGS"])
+
+myenv.Program("slimber", ["main.cpp"])
diff --git a/Slimber/CLI/main.cpp b/Slimber/CLI/main.cpp
index b82ffcd..0dd2c04 100644
--- a/Slimber/CLI/main.cpp
+++ b/Slimber/CLI/main.cpp
@@ -7,7 +7,7 @@
 #include "Swiften/LinkLocal/LinkLocalServiceBrowser.h"
 #include "Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.h"
 #include "Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h"
-#include "Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuerier.h"
+//#include "Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuerier.h"
 #include "Swiften/EventLoop/SimpleEventLoop.h"
 #include "Swiften/Application/Platform/PlatformApplication.h"
 
@@ -15,10 +15,12 @@ using namespace Swift;
 
 int main() {
 	SimpleEventLoop eventLoop;
+  /*
 	boost::shared_ptr<BonjourQuerier> querier(new BonjourQuerier());
 	querier->start();
 	LinkLocalServiceBrowser browser(querier);
 	browser.start();
+  */
 
 /*
 	FileVCardCollection vCardCollection(PlatformApplication("Slimber").getSettingsDir());