move the themes

43 files changed, 61 insertions, 124 deletions

diff --git a/build/Makefile.themes b/build/Makefile.themes
index 577753d9..c08e2103 100644
--- a/build/Makefile.themes
+++ b/build/Makefile.themes
@@ -1,21 +1,72 @@
 include build/Makefile.incl
 
-targets = openbox
+dir = themes
 
-all clean distclean:
-	@for i in $(targets); do \
-		$(MAKE) -$(MAKEFLAGS) -f build/Makefile.themes.$$i $@; \
-	done
+files = artwiz bbs bluebox cthulhain deep ebox fieron fieron2 flux \
+        frobozz frobust mbdtex miklos nyz nyzclone ob20 operation \
+        outcomes paper purplehaaze shade steelblue steelblue2 \
+        the_orange trisb twice warp-xp
+
+srcdir := $(srcdir)/$(dir)
+dir := $(DESTDIR)$(themedir)
+sources := $(addprefix $(srcdir)/,$(files))
+
+fieron_buttons_dir := $(dir)/fieron_buttons
+fieron_buttons_srcdir := $(srcdir)/fieron_buttons
+fieron_buttons := close.xbm icon.xbm max.xbm stick.xbm
+fieron_buttons_sources := $(addprefix $(fieron_buttons_srcdir)/,$(fieron_buttons))
+
+fieron2_buttons_dir:=$(dir)/fieron2_buttons
+fieron2_buttons_srcdir:=$(srcdir)/fieron2_buttons
+fieron2_buttons:=close.xbm icon.xbm max.xbm stick.xbm
+fieron2_buttons_sources := $(addprefix $(fieron2_buttons_srcdir)/,$(fieron2_buttons))
+
+ebox_buttons_dir:=$(dir)/ebox_buttons
+ebox_buttons_srcdir:=$(srcdir)/ebox_buttons
+ebox_buttons:=close.xbm icon.xbm max.xbm
+ebox_buttons_sources := $(addprefix $(ebox_buttons_srcdir)/,$(ebox_buttons))
+
+all:
 
 install:
-	@for i in $(targets); do \
-		$(MAKE) -$(MAKEFLAGS) -f build/Makefile.themes.$$i $@; \
+	$(INSTALL) -d $(dir)
+	for i in $(sources); do \
+		$(INSTALL) -m 644 $$i $(dir); \
+	done
+
+	$(INSTALL) -d $(fieron_buttons_dir)
+	for i in $(fieron_buttons_sources); do \
+		$(INSTALL) $$i $(fieron_buttons_dir); \
+	done
+	$(INSTALL) -d $(fieron2_buttons_dir)
+	for i in $(fieron2_buttons_sources); do \
+		$(INSTALL) $$i $(fieron2_buttons_dir); \
+	done
+	$(INSTALL) -d $(ebox_buttons_dir)
+	for i in $(ebox_buttons_sources); do \
+		$(INSTALL) $$i $(ebox_buttons_dir); \
 	done
 
 uninstall:
-	@for i in $(targets); do \
-		$(MAKE) -$(MAKEFLAGS) -f build/Makefile.themes.$$i $@; \
+	for i in $(ebox_buttons); do \
+		$(RM) $(ebox_buttons_dir)/$$i; \
+	done
+	-rmdir $(ebox_buttons_dir)
+	for i in $(fieron2_buttons); do \
+		$(RM) $(fieron2_buttons_dir)/$$i; \
+	done
+	-rmdir $(fieron2_buttons_dir)
+	for i in $(fieron_buttons); do \
+		$(RM) $(fieron_buttons_dir)/$$i; \
 	done
-	-rmdir $(DESTDIR)$(themedir)
+	-rmdir $(fieron_buttons_dir)
+	for i in $(files); do \
+		$(RM) $(dir)/$$i; \
+	done
+	-rmdir $(dir)
+
+clean:
+
+distclean:
 
 .PHONY: all clean distclean install uninstall
diff --git a/themes/openbox/bbs b/themes/bbs
index bb258318..bb258318 100644
--- a/themes/openbox/bbs
+++ b/themes/bbs
diff --git a/themes/openbox/bluebox b/themes/bluebox
index b2676200..b2676200 100644
--- a/themes/openbox/bluebox
+++ b/themes/bluebox
diff --git a/themes/openbox/cthulhain b/themes/cthulhain
index 5f55c4ce..5f55c4ce 100644
--- a/themes/openbox/cthulhain
+++ b/themes/cthulhain
diff --git a/themes/openbox/deep b/themes/deep
index ddcb51eb..ddcb51eb 100644
--- a/themes/openbox/deep
+++ b/themes/deep
diff --git a/themes/openbox/ebox b/themes/ebox
index a3d1a898..a3d1a898 100644
--- a/themes/openbox/ebox
+++ b/themes/ebox
diff --git a/themes/openbox/ebox_buttons/bulletbc.xbm b/themes/ebox_buttons/bulletbc.xbm
index f74daa69..f74daa69 100644
--- a/themes/openbox/ebox_buttons/bulletbc.xbm
+++ b/themes/ebox_buttons/bulletbc.xbm
diff --git a/themes/openbox/ebox_buttons/bulletl.xbm b/themes/ebox_buttons/bulletl.xbm
index b136694e..b136694e 100644
--- a/themes/openbox/ebox_buttons/bulletl.xbm
+++ b/themes/ebox_buttons/bulletl.xbm
diff --git a/themes/openbox/ebox_buttons/bulletr.xbm b/themes/ebox_buttons/bulletr.xbm
index 5b2d6fd3..5b2d6fd3 100644
--- a/themes/openbox/ebox_buttons/bulletr.xbm
+++ b/themes/ebox_buttons/bulletr.xbm
diff --git a/themes/openbox/ebox_buttons/close.xbm b/themes/ebox_buttons/close.xbm
index a97c5334..a97c5334 100644
--- a/themes/openbox/ebox_buttons/close.xbm
+++ b/themes/ebox_buttons/close.xbm
diff --git a/themes/openbox/ebox_buttons/icon.xbm b/themes/ebox_buttons/icon.xbm
index 38d8f73a..38d8f73a 100644
--- a/themes/openbox/ebox_buttons/icon.xbm
+++ b/themes/ebox_buttons/icon.xbm
diff --git a/themes/openbox/ebox_buttons/max.xbm b/themes/ebox_buttons/max.xbm
index f143a223..f143a223 100644
--- a/themes/openbox/ebox_buttons/max.xbm
+++ b/themes/ebox_buttons/max.xbm
diff --git a/themes/openbox/fieron b/themes/fieron
index c4a19d95..c4a19d95 100644
--- a/themes/openbox/fieron
+++ b/themes/fieron
diff --git a/themes/openbox/fieron2 b/themes/fieron2
index 6c7c5969..6c7c5969 100644
--- a/themes/openbox/fieron2
+++ b/themes/fieron2
diff --git a/themes/openbox/fieron2_buttons/close.xbm b/themes/fieron2_buttons/close.xbm
index aea54882..aea54882 100644
--- a/themes/openbox/fieron2_buttons/close.xbm
+++ b/themes/fieron2_buttons/close.xbm
diff --git a/themes/openbox/fieron2_buttons/icon.xbm b/themes/fieron2_buttons/icon.xbm
index 1cd40fcd..1cd40fcd 100644
--- a/themes/openbox/fieron2_buttons/icon.xbm
+++ b/themes/fieron2_buttons/icon.xbm
diff --git a/themes/openbox/fieron2_buttons/max.xbm b/themes/fieron2_buttons/max.xbm
index 2cd94e84..2cd94e84 100644
--- a/themes/openbox/fieron2_buttons/max.xbm
+++ b/themes/fieron2_buttons/max.xbm
diff --git a/themes/openbox/fieron2_buttons/stick.xbm b/themes/fieron2_buttons/stick.xbm
index 4345dfab..4345dfab 100644
--- a/themes/openbox/fieron2_buttons/stick.xbm
+++ b/themes/fieron2_buttons/stick.xbm
diff --git a/themes/openbox/fieron_buttons/close.xbm b/themes/fieron_buttons/close.xbm
index aea54882..aea54882 100644
--- a/themes/openbox/fieron_buttons/close.xbm
+++ b/themes/fieron_buttons/close.xbm
diff --git a/themes/openbox/fieron_buttons/icon.xbm b/themes/fieron_buttons/icon.xbm
index 1cd40fcd..1cd40fcd 100644
--- a/themes/openbox/fieron_buttons/icon.xbm
+++ b/themes/fieron_buttons/icon.xbm
diff --git a/themes/openbox/fieron_buttons/max.xbm b/themes/fieron_buttons/max.xbm
index 2cd94e84..2cd94e84 100644
--- a/themes/openbox/fieron_buttons/max.xbm
+++ b/themes/fieron_buttons/max.xbm
diff --git a/themes/openbox/fieron_buttons/stick.xbm b/themes/fieron_buttons/stick.xbm
index 4345dfab..4345dfab 100644
--- a/themes/openbox/fieron_buttons/stick.xbm
+++ b/themes/fieron_buttons/stick.xbm
diff --git a/themes/openbox/flux b/themes/flux
index 46fc8d5d..46fc8d5d 100644
--- a/themes/openbox/flux
+++ b/themes/flux
diff --git a/themes/openbox/frobozz b/themes/frobozz
index c99005fe..c99005fe 100644
--- a/themes/openbox/frobozz
+++ b/themes/frobozz
diff --git a/themes/openbox/frobust b/themes/frobust
index 3f8a13f2..3f8a13f2 100644
--- a/themes/openbox/frobust
+++ b/themes/frobust
diff --git a/themes/openbox/mbdtex b/themes/mbdtex
index bee7760d..bee7760d 100644
--- a/themes/openbox/mbdtex
+++ b/themes/mbdtex
diff --git a/themes/openbox/miklos b/themes/miklos
index c75c78a3..c75c78a3 100644
--- a/themes/openbox/miklos
+++ b/themes/miklos
diff --git a/themes/openbox/nyz b/themes/nyz
index 33f1f347..33f1f347 100644
--- a/themes/openbox/nyz
+++ b/themes/nyz
diff --git a/themes/openbox/nyzclone b/themes/nyzclone
index 46ca5a93..46ca5a93 100644
--- a/themes/openbox/nyzclone
+++ b/themes/nyzclone
diff --git a/themes/openbox/ob20 b/themes/ob20
index 32afe96b..32afe96b 100644
--- a/themes/openbox/ob20
+++ b/themes/ob20
diff --git a/themes/openbox/.cvsignore b/themes/openbox/.cvsignore
deleted file mode 100644
index e69de29b..00000000
--- a/themes/openbox/.cvsignore
+++ /dev/null
diff --git a/themes/openbox/artwiz b/themes/openbox/artwiz
deleted file mode 100644
index c563f3f2..00000000
--- a/themes/openbox/artwiz
+++ /dev/null
@@ -1,114 +0,0 @@
-toolbar:			raised gradient vertical
-toolbar.color:			rgb:80/84/88
-toolbar.colorTo:		rgb:30/34/38
-
-toolbar.button:			raised gradient diagonal
-toolbar.button.color:		rgb:90/94/98
-toolbar.button.colorTo:		rgb:20/24/28
-toolbar.button.picColor:	white
-
-toolbar.button.pressed:		sunken gradient diagonal
-toolbar.button.pressed.color:	black
-toolbar.button.pressed.colorTo:	rgb:80/98/d0
-
-toolbar.clock:			sunken gradient diagonal
-toolbar.clock.color:		rgb:10/20/30
-toolbar.clock.colorTo:		rgb:70/80/90
-toolbar.clock.textColor:	white
-
-toolbar.label:			sunken gradient diagonal
-toolbar.label.color:		rgb:10/20/30
-toolbar.label.colorTo:		rgb:70/80/90
-toolbar.label.textColor:	white
-
-toolbar.windowLabel:		sunken gradient diagonal
-toolbar.windowLabel.color:	rgb:10/20/30
-toolbar.windowLabel.colorTo:	rgb:70/80/90
-toolbar.windowLabel.textColor:	white
-
-toolbar.justify:		center
-
-
-menu.title:			raised gradient diagonal
-menu.title.color:		rgb:90/94/98
-menu.title.colorTo:		rgb:20/24/28
-menu.title.textColor:		white
-menu.title.justify:		center
-
-menu.frame:			sunken gradient diagonal
-menu.frame.color:		rgb:10/20/30
-menu.frame.colorTo:		rgb:70/80/90
-menu.frame.textColor:		rgb:90/a0/b0
-menu.frame.justify:		center
-
-menu.hilite:			raised gradient diagonal
-menu.hilite.color:		rgb:90/94/98
-menu.hilite.colorTo:		rgb:20/24/28
-menu.hilite.textColor:		white
-
-menu.bullet:			empty
-menu.bullet.position:		right
-
-
-window.title.focus:		raised gradient vertical
-window.title.focus.color:	rgb:80/84/88
-window.title.focus.colorTo:	rgb:30/34/38
-window.title.unfocus:		raised vertical gradient
-window.title.unfocus.color:	rgb:50/54/58
-window.title.unfocus.colorTo:	black
-
-window.label.focus:		sunken diagonal gradient
-window.label.focus.color:	rgb:10/20/30
-window.label.focus.colorTo:	rgb:70/80/90
-window.label.focus.textColor:	white
-window.label.unfocus:		sunken gradient diagonal
-window.label.unfocus.color:	black
-window.label.unfocus.colorTo:	rgb:40/50/60
-window.label.unfocus.textColor:	rgb:60/64/68
-
-window.button.focus:		raised gradient diagonal
-window.button.focus.color:	rgb:90/94/98
-window.button.focus.colorTo:	rgb:20/24/28
-window.button.focus.picColor:	white
-window.button.unfocus:		raised gradient diagonal
-window.button.unfocus.color:	rgb:50/54/58
-window.button.unfocus.colorTo:	black
-window.button.unfocus.picColor:	rgb:70/74/78
-window.button.pressed:		sunken gradient diagonal
-window.button.pressed.color:	rgb:20/40/50
-window.button.pressed.colorTo:	rgb:60/70/80
-
-window.frame.focusColor:	rgb:40/44/48
-window.frame.unfocusColor:	rgb:20/24/28
-
-window.handle.focus:		raised gradient diagonal
-window.handle.focus.color:	rgb:70/74/78
-window.handle.focus.colorTo:	rgb:40/44/48
-window.handle.unfocus:		raised gradient diagonal
-window.handle.unfocus.color:	rgb:50/54/58
-window.handle.unfocus.colorTo:	black
-
-window.grip.focus:		sunken diagonal gradient
-window.grip.focus.color:	rgb:20/30/40
-window.grip.focus.colorTo:	rgb:60/70/80
-window.grip.unfocus:		sunken diagonal gradient
-window.grip.unfocus.color:	black
-window.grip.unfocus.colorTo:	rgb:30/40/50
-
-window.justify:			center
-
-
-borderColor:			black
-
-bevelWidth:			2
-borderWidth:			1
-handleWidth:			5
-
-rootCommand:	bsetroot -mod 4 4 -bg rgb:10/18/20 -fg rgb:30/38/40
-
-*Font:	-*-lucidatypewriter-medium-r-*-*-*-100-*-*-*-*-*-*
-
-*xft.font:		Verdana
-*xft.size:		8
-
-menu.*.xft.size:	10
\ No newline at end of file
diff --git a/themes/openbox/operation b/themes/operation
index 9b3b261c..9b3b261c 100644
--- a/themes/openbox/operation
+++ b/themes/operation
diff --git a/themes/openbox/outcomes b/themes/outcomes
index 5d8e450f..5d8e450f 100644
--- a/themes/openbox/outcomes
+++ b/themes/outcomes
diff --git a/themes/openbox/paper b/themes/paper
index f8e257b7..f8e257b7 100644
--- a/themes/openbox/paper
+++ b/themes/paper
diff --git a/themes/openbox/purplehaaze b/themes/purplehaaze
index 5bf8bd69..5bf8bd69 100644
--- a/themes/openbox/purplehaaze
+++ b/themes/purplehaaze
diff --git a/themes/openbox/shade b/themes/shade
index 43c7f312..43c7f312 100644
--- a/themes/openbox/shade
+++ b/themes/shade
diff --git a/themes/openbox/steelblue b/themes/steelblue
index 8fe4b57a..8fe4b57a 100644
--- a/themes/openbox/steelblue
+++ b/themes/steelblue
diff --git a/themes/openbox/steelblue2 b/themes/steelblue2
index 0b03da45..0b03da45 100644
--- a/themes/openbox/steelblue2
+++ b/themes/steelblue2
diff --git a/themes/openbox/the_orange b/themes/the_orange
index 4d3c6ebc..4d3c6ebc 100644
--- a/themes/openbox/the_orange
+++ b/themes/the_orange
diff --git a/themes/openbox/trisb b/themes/trisb
index 66d4450d..66d4450d 100644
--- a/themes/openbox/trisb
+++ b/themes/trisb
diff --git a/themes/openbox/twice b/themes/twice
index a00c72b4..a00c72b4 100644
--- a/themes/openbox/twice
+++ b/themes/twice
diff --git a/themes/openbox/warp-xp b/themes/warp-xp
index da1caf33..da1caf33 100644
--- a/themes/openbox/warp-xp
+++ b/themes/warp-xp