aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2012-12-05 14:43:33 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2012-12-05 15:00:55 (GMT)
commitb178bed60b5bd8b2c9ed0cbc67fd729ff3820589 (patch)
tree4470405caad514f8207df3219ea0517e5f0316e1 /src
parent7e374fcef67aec07124a12d94833d266f292e583 (diff)
downloadfluxbox-b178bed60b5bd8b2c9ed0cbc67fd729ff3820589.zip
fluxbox-b178bed60b5bd8b2c9ed0cbc67fd729ff3820589.tar.bz2
Simplified 'configure' / build system
* reduced duplicated auto-code * renamed '--enable-newwmspec' to '--enable-ewmh' * don't compile 'Slit'-code when '--disable-slit' * use AS_IF() in configure.in * use AS_HELP_STRING() instead of obsolete AC_HELP_STRING in configure.in * removed redundant calls to 'imlib2-config' to fill in $IMLIB2_CFLAGS and $IMLIB2_LIBS, AC_PATH_GENERIC() does that out of the box already
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am15
-rw-r--r--src/Screen.cc20
-rw-r--r--src/fluxbox.cc10
-rw-r--r--src/main.cc6
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
89 89
90 90
91 91
92if NEWWMSPEC 92if EWMH
93newwmspec_SOURCE= Ewmh.hh Ewmh.cc 93EWMH_SOURCE= Ewmh.hh Ewmh.cc
94endif 94endif
95if REMEMBER_SRC 95if REMEMBER_SRC
96REMEMBER_SOURCE= Remember.hh Remember.cc 96REMEMBER_SOURCE= Remember.hh Remember.cc
@@ -108,6 +108,10 @@ TOOLBAR_SOURCE = Toolbar.hh Toolbar.cc \
108 ToolFactory.hh ToolFactory.cc 108 ToolFactory.hh ToolFactory.cc
109endif 109endif
110 110
111if SLIT_SRC
112SLIT_SOURCE = Slit.cc Slit.hh SlitTheme.hh SlitTheme.cc SlitClient.hh SlitClient.cc
113endif
114
111fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \ 115fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
112 FbAtoms.hh FbAtoms.cc FbWinFrame.hh FbWinFrame.cc \ 116 FbAtoms.hh FbAtoms.cc FbWinFrame.hh FbWinFrame.cc \
113 FbWinFrameTheme.hh FbWinFrameTheme.cc \ 117 FbWinFrameTheme.hh FbWinFrameTheme.cc \
@@ -118,7 +122,6 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
118 OSDWindow.hh OSDWindow.cc \ 122 OSDWindow.hh OSDWindow.cc \
119 TooltipWindow.hh TooltipWindow.cc \ 123 TooltipWindow.hh TooltipWindow.cc \
120 Screen.cc Screen.hh \ 124 Screen.cc Screen.hh \
121 Slit.cc Slit.hh SlitTheme.hh SlitTheme.cc SlitClient.hh SlitClient.cc \
122 WinButton.hh WinButton.cc \ 125 WinButton.hh WinButton.cc \
123 WinButtonTheme.hh WinButtonTheme.cc \ 126 WinButtonTheme.hh WinButtonTheme.cc \
124 Window.cc Window.hh WindowState.cc WindowState.hh\ 127 Window.cc Window.hh WindowState.cc WindowState.hh\
@@ -162,8 +165,10 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
162 WindowMenuAccessor.hh \ 165 WindowMenuAccessor.hh \
163 RectangleUtil.hh \ 166 RectangleUtil.hh \
164 Debug.hh \ 167 Debug.hh \
165 ${newwmspec_SOURCE} \ 168 ${EWMH_SOURCE} \
166 ${REMEMBER_SOURCE} ${TOOLBAR_SOURCE} 169 ${REMEMBER_SOURCE} \
170 ${SLIT_SOURCE} \
171 ${TOOLBAR_SOURCE}
167 172
168 173
169LDADD=FbTk/libFbTk.a FbTk/LogicCommands.o defaults.$(OBJEXT) 174LDADD=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 @@
84#include "config.h" 84#include "config.h"
85#endif // HAVE_CONFIG_H 85#endif // HAVE_CONFIG_H
86 86
87#ifdef SLIT 87#ifdef USE_SLIT
88#include "Slit.hh" 88#include "Slit.hh"
89#include "SlitClient.hh" 89#include "SlitClient.hh"
90#else 90#else
91// fill it in 91// fill it in
92class Slit {}; 92class Slit {};
93#endif // SLIT 93#endif // USE_SLIT
94 94
95#ifdef USE_TOOLBAR 95#ifdef USE_TOOLBAR
96#include "Toolbar.hh" 96#include "Toolbar.hh"
@@ -478,10 +478,10 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
478 478
479 changeWorkspaceID(first_desktop); 479 changeWorkspaceID(first_desktop);
480 480
481#ifdef SLIT 481#ifdef USE_SLIT
482 m_slit.reset(new Slit(*this, *layerManager().getLayer(ResourceLayer::DESKTOP), 482 m_slit.reset(new Slit(*this, *layerManager().getLayer(ResourceLayer::DESKTOP),
483 fluxbox->getSlitlistFilename().c_str())); 483 fluxbox->getSlitlistFilename().c_str()));
484#endif // SLIT 484#endif // USE_SLIT
485 485
486 rm.unlock(); 486 rm.unlock();
487 487
@@ -682,10 +682,10 @@ void BScreen::initWindows() {
682 XFree(children); 682 XFree(children);
683 683
684 // now, show slit and toolbar 684 // now, show slit and toolbar
685#ifdef SLIT 685#ifdef USE_SLIT
686 if (slit()) 686 if (slit())
687 slit()->show(); 687 slit()->show();
688#endif // SLIT 688#endif // USE_SLIT
689 689
690} 690}
691 691
@@ -1209,11 +1209,11 @@ bool BScreen::addKdeDockapp(Window client) {
1209 handler = Fluxbox::instance()->getAtomHandler(SystemTray::getNetSystemTrayAtom(screenNumber())); 1209 handler = Fluxbox::instance()->getAtomHandler(SystemTray::getNetSystemTrayAtom(screenNumber()));
1210#endif 1210#endif
1211 if (handler == 0) { 1211 if (handler == 0) {
1212#ifdef SLIT 1212#ifdef USE_SLIT
1213 if (slit() != 0 && slit()->acceptKdeDockapp()) 1213 if (slit() != 0 && slit()->acceptKdeDockapp())
1214 slit()->addClient(client); 1214 slit()->addClient(client);
1215 else 1215 else
1216#endif // SLIT 1216#endif // USE_SLIT
1217 return false; 1217 return false;
1218 } else { 1218 } else {
1219 // this handler is a special case 1219 // this handler is a special case
@@ -1242,10 +1242,10 @@ FluxboxWindow *BScreen::createWindow(Window client) {
1242 1242
1243 if (winclient->initial_state == WithdrawnState) { 1243 if (winclient->initial_state == WithdrawnState) {
1244 delete winclient; 1244 delete winclient;
1245#ifdef SLIT 1245#ifdef USE_SLIT
1246 if (slit() && !isKdeDockapp(client)) 1246 if (slit() && !isKdeDockapp(client))
1247 slit()->addClient(client); 1247 slit()->addClient(client);
1248#endif // SLIT 1248#endif // USE_SLIT
1249 return 0; 1249 return 0;
1250 } 1250 }
1251 1251
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 @@
66#include "config.h" 66#include "config.h"
67#endif // HAVE_CONFIG_H 67#endif // HAVE_CONFIG_H
68 68
69#ifdef USE_NEWWMSPEC 69#ifdef USE_EWMH
70#include "Ewmh.hh" 70#include "Ewmh.hh"
71#endif // USE_NEWWMSPEC 71#endif // USE_EWMH
72#ifdef REMEMBER 72#ifdef REMEMBER
73#include "Remember.hh" 73#include "Remember.hh"
74#endif // REMEMBER 74#endif // REMEMBER
@@ -418,9 +418,9 @@ Fluxbox::Fluxbox(int argc, char **argv,
418 418
419 m_keyscreen = m_mousescreen = m_screen_list.front(); 419 m_keyscreen = m_mousescreen = m_screen_list.front();
420 420
421#ifdef USE_NEWWMSPEC 421#ifdef USE_EWMH
422 addAtomHandler(new Ewmh()); // for Extended window manager atom support 422 addAtomHandler(new Ewmh());
423#endif // USE_NEWWMSPEC 423#endif // USE_EWMH
424 // parse apps file after creating screens (so we can tell if it's a restart 424 // parse apps file after creating screens (so we can tell if it's a restart
425 // for [startup] items) but before creating windows 425 // for [startup] items) but before creating windows
426 // this needs to be after ewmh and gnome, so state atoms don't get 426 // 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) {
152#endif // DEBUG 152#endif // DEBUG
153 "DEBUG" << endl << 153 "DEBUG" << endl <<
154 154
155#ifndef USE_NEWWMSPEC 155#ifndef USE_EWMH
156 NOT << 156 NOT <<
157#endif // USE_NEWWMSPEC 157#endif // USE_EWMH
158 "EWMH" << endl << 158 "EWMH" << endl <<
159 159
160#ifndef HAVE_IMLIB2 160#ifndef HAVE_IMLIB2
@@ -182,7 +182,7 @@ static void showInfo(ostream &ostr) {
182#endif // SHAPE 182#endif // SHAPE
183 "SHAPE" << endl << 183 "SHAPE" << endl <<
184 184
185#ifndef SLIT 185#ifndef USE_SLIT
186 NOT << 186 NOT <<
187#endif // SLIT 187#endif // SLIT
188 "SLIT" << endl << 188 "SLIT" << endl <<