diff options
author | markt <markt> | 2007-10-13 21:51:37 (GMT) |
---|---|---|
committer | markt <markt> | 2007-10-13 21:51:37 (GMT) |
commit | a59428d67a95a9df16554962f0a6257d6378328a (patch) | |
tree | f856ed9300c34f7a17d499f22d895610cfbc08e5 /src/Makefile.am | |
parent | 41b5c6dadb1f474675660cef18b812d4c2338ed2 (diff) | |
download | fluxbox-a59428d67a95a9df16554962f0a6257d6378328a.zip fluxbox-a59428d67a95a9df16554962f0a6257d6378328a.tar.bz2 |
merged changes from pre-devel
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index b6cb024..f82a206 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -87,9 +87,8 @@ TOOLBAR_SOURCE = Toolbar.hh Toolbar.cc \ | |||
87 | ToolbarTheme.hh ToolbarTheme.cc ToolbarItem.hh ToolbarItem.cc \ | 87 | ToolbarTheme.hh ToolbarTheme.cc ToolbarItem.hh ToolbarItem.cc \ |
88 | ClockTool.hh ClockTool.cc \ | 88 | ClockTool.hh ClockTool.cc \ |
89 | WorkspaceNameTool.hh WorkspaceNameTool.cc WorkspaceNameTheme.hh \ | 89 | WorkspaceNameTool.hh WorkspaceNameTool.cc WorkspaceNameTheme.hh \ |
90 | IconbarTool.hh IconbarTool.cc IconbarTheme.hh IconbarTheme.cc \ | 90 | IconbarTool.hh IconbarTool.cc \ |
91 | ToolTheme.hh ToolTheme.cc \ | 91 | ToolTheme.hh ToolTheme.cc \ |
92 | IconButton.hh IconButton.cc \ | ||
93 | SystemTray.hh SystemTray.cc \ | 92 | SystemTray.hh SystemTray.cc \ |
94 | GenericTool.hh GenericTool.cc \ | 93 | GenericTool.hh GenericTool.cc \ |
95 | ButtonTool.hh ButtonTool.cc ButtonTheme.hh ButtonTheme.cc \ | 94 | ButtonTool.hh ButtonTool.cc ButtonTheme.hh ButtonTheme.cc \ |
@@ -102,7 +101,6 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \ | |||
102 | FbWinFrameTheme.hh FbWinFrameTheme.cc \ | 101 | FbWinFrameTheme.hh FbWinFrameTheme.cc \ |
103 | fluxbox.cc fluxbox.hh \ | 102 | fluxbox.cc fluxbox.hh \ |
104 | Keys.cc Keys.hh main.cc \ | 103 | Keys.cc Keys.hh main.cc \ |
105 | Netizen.cc Netizen.hh \ | ||
106 | RootTheme.hh RootTheme.cc \ | 104 | RootTheme.hh RootTheme.cc \ |
107 | FbRootWindow.hh FbRootWindow.cc \ | 105 | FbRootWindow.hh FbRootWindow.cc \ |
108 | Screen.cc Screen.hh ScreenResources.cc \ | 106 | Screen.cc Screen.hh ScreenResources.cc \ |
@@ -117,7 +115,6 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \ | |||
117 | WinClient.hh WinClient.cc \ | 115 | WinClient.hh WinClient.cc \ |
118 | Strut.hh \ | 116 | Strut.hh \ |
119 | Xinerama.hh \ | 117 | Xinerama.hh \ |
120 | IconMenuItem.hh \ | ||
121 | Xutil.hh Xutil.cc \ | 118 | Xutil.hh Xutil.cc \ |
122 | CurrentWindowCmd.hh CurrentWindowCmd.cc \ | 119 | CurrentWindowCmd.hh CurrentWindowCmd.cc \ |
123 | WorkspaceCmd.hh WorkspaceCmd.cc \ | 120 | WorkspaceCmd.hh WorkspaceCmd.cc \ |
@@ -135,7 +132,7 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \ | |||
135 | StyleMenuItem.hh StyleMenuItem.cc \ | 132 | StyleMenuItem.hh StyleMenuItem.cc \ |
136 | RootCmdMenuItem.hh RootCmdMenuItem.cc\ | 133 | RootCmdMenuItem.hh RootCmdMenuItem.cc\ |
137 | MenuCreator.hh MenuCreator.cc \ | 134 | MenuCreator.hh MenuCreator.cc \ |
138 | IconMenu.hh IconMenu.cc \ | 135 | ClientMenu.hh ClientMenu.cc \ |
139 | WorkspaceMenu.hh WorkspaceMenu.cc \ | 136 | WorkspaceMenu.hh WorkspaceMenu.cc \ |
140 | FocusModelMenuItem.hh \ | 137 | FocusModelMenuItem.hh \ |
141 | ToggleMenu.hh \ | 138 | ToggleMenu.hh \ |
@@ -146,11 +143,13 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \ | |||
146 | PlacementStrategy.hh \ | 143 | PlacementStrategy.hh \ |
147 | CascadePlacement.hh CascadePlacement.cc \ | 144 | CascadePlacement.hh CascadePlacement.cc \ |
148 | ColSmartPlacement.hh ColSmartPlacement.cc \ | 145 | ColSmartPlacement.hh ColSmartPlacement.cc \ |
146 | MinOverlapPlacement.hh MinOverlapPlacement.cc \ | ||
149 | RowSmartPlacement.hh RowSmartPlacement.cc \ | 147 | RowSmartPlacement.hh RowSmartPlacement.cc \ |
150 | ScreenPlacement.hh ScreenPlacement.cc \ | 148 | ScreenPlacement.hh ScreenPlacement.cc \ |
151 | UnderMousePlacement.hh UnderMousePlacement.cc \ | 149 | UnderMousePlacement.hh UnderMousePlacement.cc \ |
152 | WinClientUtil.hh WinClientUtil.cc \ | ||
153 | AttentionNoticeHandler.hh AttentionNoticeHandler.cc \ | 150 | AttentionNoticeHandler.hh AttentionNoticeHandler.cc \ |
151 | IconButton.hh IconButton.cc \ | ||
152 | IconbarTheme.hh IconbarTheme.cc \ | ||
154 | STLUtil.hh \ | 153 | STLUtil.hh \ |
155 | ${newwmspec_SOURCE} ${gnome_SOURCE} \ | 154 | ${newwmspec_SOURCE} ${gnome_SOURCE} \ |
156 | ${REMEMBER_SOURCE} ${TOOLBAR_SOURCE} | 155 | ${REMEMBER_SOURCE} ${TOOLBAR_SOURCE} |