From: John Crispin <john@openwrt.org>
Date: Thu, 20 Sep 2007 19:46:44 +0000 (+0000)
Subject: removed lots of unneeded fluxbox files and added our own menu
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=3f29643ae620dc2042a066d7e525a6747c3b9aae

removed lots of unneeded fluxbox files and added our own menu

SVN-Revision: 8888
---

diff --git a/XOrg/app/fluxbox/Makefile b/XOrg/app/fluxbox/Makefile
index b86548286c..a01792cbc3 100644
--- a/XOrg/app/fluxbox/Makefile
+++ b/XOrg/app/fluxbox/Makefile
@@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk
 CONFIGURE_VARS+=LIBS="-nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm" \
 		CXXLD="$(TARGET_CC)" 
 
-CONFIGURE_ARGS+=--disable-static --disable-xmb
+CONFIGURE_ARGS+=--disable-xmb
 
 define Package/fluxbox
   SECTION:=xorg-wm
@@ -49,9 +49,12 @@ define Build/Compile
 endef
 
 define Package/fluxbox/install
-	$(INSTALL_DIR) $(1)/usr/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ $(1)/usr/
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/ $(1)/usr/
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/usr/share/fluxbox/styles/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/{fluxbox,fbsetbg} $(1)/usr/
+	$(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/{init,keys} $(1)/usr/share/fluxbox/
+	$(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/styles/BlueFlux/ $(1)/usr/share/fluxbox/styles
+	$(CP) files/menu $(1)/usr/share/fluxbox/
 endef
 
 $(eval $(call BuildPackage,fluxbox))
diff --git a/XOrg/app/fluxbox/files/menu b/XOrg/app/fluxbox/files/menu
new file mode 100644
index 0000000000..3357552d3c
--- /dev/null
+++ b/XOrg/app/fluxbox/files/menu
@@ -0,0 +1,31 @@
+[begin] (Fluxbox-OpenWrt)
+      [exec] (xterm) {xterm}
+      [exec]   (vi) {xterm -e vi}
+      [exec]   (xmms) {xmms}
+      [exec]   (alsamixer) {xterm -e alsamixer}
+      [exec]   (vlc) {vlc}
+      [exec]   (xclock) {xclock}
+      [exec]   (xmag) {xmag}
+      [exec]   (xclock) {xclock}
+      [exec]   (xcalc) {xcalc}
+      [exec]   (xpdf) {xpdf}
+      [exec]   (top) {xterm -e top}
+[submenu] (fluxbox menu)
+      [config] (Configure)
+[submenu] (System Styles) {Choose a style...}
+      [stylesdir] (/usr/share/fluxbox/styles)
+[end]
+      [workspaces] (Workspace List)
+[submenu] (Tools)
+      [exec]   (fluxconf) {fluxconf}
+      [exec]   (fluxkeys) {fluxkeys}
+      [exec]   (fluxmenu) {fluxmenu}
+[end]
+      [commanddialog] (Fluxbox Command)
+      [reconfig] (Reload config)
+      [restart] (Restart)
+      [exec] (About) {(fluxbox -v; fluxbox -info | sed 1d) 2> /dev/null | xmessage -file - -center}
+      [separator]
+      [exit] (Exit)
+[end]
+[end]