diff options
author | Mathias Gumz <akira at fluxbox dot org> | 2012-12-05 14:43:33 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2012-12-05 15:00:55 (GMT) |
commit | b178bed60b5bd8b2c9ed0cbc67fd729ff3820589 (patch) | |
tree | 4470405caad514f8207df3219ea0517e5f0316e1 /src/Makefile.am | |
parent | 7e374fcef67aec07124a12d94833d266f292e583 (diff) | |
download | fluxbox-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/Makefile.am')
-rw-r--r-- | src/Makefile.am | 15 |
1 files changed, 10 insertions, 5 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 | ||
92 | if NEWWMSPEC | 92 | if EWMH |
93 | newwmspec_SOURCE= Ewmh.hh Ewmh.cc | 93 | EWMH_SOURCE= Ewmh.hh Ewmh.cc |
94 | endif | 94 | endif |
95 | if REMEMBER_SRC | 95 | if REMEMBER_SRC |
96 | REMEMBER_SOURCE= Remember.hh Remember.cc | 96 | REMEMBER_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 |
109 | endif | 109 | endif |
110 | 110 | ||
111 | if SLIT_SRC | ||
112 | SLIT_SOURCE = Slit.cc Slit.hh SlitTheme.hh SlitTheme.cc SlitClient.hh SlitClient.cc | ||
113 | endif | ||
114 | |||
111 | fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \ | 115 | fluxbox_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 | ||
169 | LDADD=FbTk/libFbTk.a FbTk/LogicCommands.o defaults.$(OBJEXT) | 174 | LDADD=FbTk/libFbTk.a FbTk/LogicCommands.o defaults.$(OBJEXT) |