4 files changed, 28 insertions, 23 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 9a84897..382d41a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -89,8 +89,8 @@ fluxbox.$(OBJEXT): defaults.hh
 
 
 
-if NEWWMSPEC
-newwmspec_SOURCE= Ewmh.hh Ewmh.cc
+if EWMH
+EWMH_SOURCE= Ewmh.hh Ewmh.cc
 endif
 if REMEMBER_SRC
 REMEMBER_SOURCE= Remember.hh Remember.cc
@@ -108,6 +108,10 @@ TOOLBAR_SOURCE = Toolbar.hh Toolbar.cc \
         ToolFactory.hh ToolFactory.cc
 endif
 
+if SLIT_SRC
+SLIT_SOURCE = Slit.cc Slit.hh SlitTheme.hh SlitTheme.cc SlitClient.hh SlitClient.cc
+endif
+
 fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
         FbAtoms.hh FbAtoms.cc FbWinFrame.hh FbWinFrame.cc \
         FbWinFrameTheme.hh FbWinFrameTheme.cc \
@@ -118,7 +122,6 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
         OSDWindow.hh OSDWindow.cc \
         TooltipWindow.hh TooltipWindow.cc \
         Screen.cc Screen.hh \
-        Slit.cc Slit.hh SlitTheme.hh SlitTheme.cc SlitClient.hh SlitClient.cc \
         WinButton.hh WinButton.cc \
         WinButtonTheme.hh WinButtonTheme.cc \
         Window.cc Window.hh WindowState.cc WindowState.hh\
@@ -162,8 +165,10 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
         WindowMenuAccessor.hh \
         RectangleUtil.hh \
         Debug.hh \
-        ${newwmspec_SOURCE} \
-        ${REMEMBER_SOURCE} ${TOOLBAR_SOURCE}
+        ${EWMH_SOURCE} \
+        ${REMEMBER_SOURCE} \
+        ${SLIT_SOURCE} \
+        ${TOOLBAR_SOURCE}
 
 
 LDADD=FbTk/libFbTk.a FbTk/LogicCommands.o defaults.$(OBJEXT)
diff --git a/src/Screen.cc b/src/Screen.cc
index b2e57ed..0d1923b 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -84,13 +84,13 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#ifdef SLIT
+#ifdef USE_SLIT
 #include "Slit.hh"
 #include "SlitClient.hh"
 #else
 // fill it in
 class Slit {};
-#endif // SLIT
+#endif // USE_SLIT
 
 #ifdef USE_TOOLBAR
 #include "Toolbar.hh"
@@ -478,10 +478,10 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
 
     changeWorkspaceID(first_desktop);
 
-#ifdef SLIT
+#ifdef USE_SLIT
     m_slit.reset(new Slit(*this, *layerManager().getLayer(ResourceLayer::DESKTOP),
                  fluxbox->getSlitlistFilename().c_str()));
-#endif // SLIT
+#endif // USE_SLIT
 
     rm.unlock();
 
@@ -682,10 +682,10 @@ void BScreen::initWindows() {
     XFree(children);
 
     // now, show slit and toolbar
-#ifdef SLIT
+#ifdef USE_SLIT
     if (slit())
         slit()->show();
-#endif // SLIT
+#endif // USE_SLIT
 
 }
 
@@ -1209,11 +1209,11 @@ bool BScreen::addKdeDockapp(Window client) {
     handler = Fluxbox::instance()->getAtomHandler(SystemTray::getNetSystemTrayAtom(screenNumber()));
 #endif
     if (handler == 0) {
-#ifdef SLIT
+#ifdef USE_SLIT
         if (slit() != 0 && slit()->acceptKdeDockapp())
             slit()->addClient(client);
         else
-#endif // SLIT
+#endif // USE_SLIT
             return false;
     } else {
         // this handler is a special case
@@ -1242,10 +1242,10 @@ FluxboxWindow *BScreen::createWindow(Window client) {
 
     if (winclient->initial_state == WithdrawnState) {
         delete winclient;
-#ifdef SLIT
+#ifdef USE_SLIT
         if (slit() && !isKdeDockapp(client))
             slit()->addClient(client);
-#endif // SLIT
+#endif // USE_SLIT
         return 0;
     }
 
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 129ac80..c144630 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -66,9 +66,9 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#ifdef USE_NEWWMSPEC
+#ifdef USE_EWMH
 #include "Ewmh.hh"
-#endif // USE_NEWWMSPEC
+#endif // USE_EWMH
 #ifdef REMEMBER
 #include "Remember.hh"
 #endif // REMEMBER
@@ -418,9 +418,9 @@ Fluxbox::Fluxbox(int argc, char **argv,
 
     m_keyscreen = m_mousescreen = m_screen_list.front();
 
-#ifdef USE_NEWWMSPEC
-    addAtomHandler(new Ewmh()); // for Extended window manager atom support
-#endif // USE_NEWWMSPEC
+#ifdef USE_EWMH
+    addAtomHandler(new Ewmh());
+#endif // USE_EWMH
     // parse apps file after creating screens (so we can tell if it's a restart
     // for [startup] items) but before creating windows
     // this needs to be after ewmh and gnome, so state atoms don't get
diff --git a/src/main.cc b/src/main.cc
index 2afef3f..c93aabf 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -152,9 +152,9 @@ static void showInfo(ostream &ostr) {
 #endif // DEBUG
         "DEBUG" << endl <<
 
-#ifndef USE_NEWWMSPEC
+#ifndef USE_EWMH
         NOT <<
-#endif // USE_NEWWMSPEC
+#endif // USE_EWMH
         "EWMH" << endl <<
 
 #ifndef HAVE_IMLIB2
@@ -182,7 +182,7 @@ static void showInfo(ostream &ostr) {
 #endif // SHAPE
         "SHAPE" << endl <<
 
-#ifndef SLIT
+#ifndef USE_SLIT
         NOT <<
 #endif // SLIT
         "SLIT" << endl <<