7 files changed, 360 insertions, 0 deletions
diff --git a/build/.cvsignore b/build/.cvsignore
new file mode 100644
index 00000000..848f07ea
--- /dev/null
+++ b/build/.cvsignore
@@ -0,0 +1 @@
+Makefile.incl
diff --git a/build/Makefile.engines b/build/Makefile.engines
new file mode 100644
index 00000000..6da55546
--- /dev/null
+++ b/build/Makefile.engines
@@ -0,0 +1,60 @@
+engines_dir:=engines
+engines_srcdir:=$(srcdir)/$(engines_dir)
+engines_depdir:=$(depdir)/$(engines_dir)
+
+engines_ob_dir:=$(engines_dir)/openbox
+engines_ob_srcdir:=$(engines_srcdir)/openbox
+engines_ob_target:=openbox.la
+engines_ob_sources:=obengine.c obtheme.c obrender.c
+engines_ob_CPPFLAGS:=$(CPPFLAGS) $(GLIB_CFLAGS) $(XFT_CFLAGS) \
+  -DG_LOG_DOMAIN=\"Engine-Openbox\" \
+  -DTHEMEDIR=\"$(themesdir)/openbox\" \
+  -DDEFAULT_THEME=\"operation\"
+
+engines_targets:=$(engines_ob_dir)/$(engines_ob_target)
+
+engines_ob_objects:=$(addprefix $(engines_ob_dir)/,$(engines_ob_sources:.c=.lo))
+engines_ob_sources:=$(addprefix $(engines_ob_srcdir)/,$(engines_ob_sources))
+engines_ob_target:=$(addprefix $(engines_ob_dir)/,$(engines_ob_target))
+engines_ob_deps:=$(addprefix $(depdir)/,$(engines_ob_objects:.lo=.d))
+engines_ob_depdir:=$(depdir)/$(engines_ob_dir)
+
+## engines_ob
+
+$(engines_ob_target): $(engines_ob_objects)
+	$(LIBTOOL) --mode=link $(CC) -rpath $(enginedir) $(engines_ob_CPPFLAGS) \
+		$(CFLAGS) -module -avoid-version -o $@ $^
+
+$(engines_ob_dir):
+	@mkdir $@
+
+$(engines_ob_dir)/%.lo: $(engines_ob_srcdir)/%.c $(engines_ob_depdir)/%.d
+	$(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+		$(engines_ob_CPPFLAGS) $(CFLAGS) -c -o $@ $<
+
+$(engines_ob_depdir)/%.d: $(engines_ob_srcdir)/%.c $(depdir)
+	@echo Building dependancies for $<
+	@mkdir $(engines_depdir) 2> /dev/null || true
+	@mkdir $(dir $@) 2> /dev/null || true
+	@$(CC) $(engines_ob_CPPFLAGS) $(CFLAGS) -w -MM -MF $@ -MQ $(<:.c=.lo) $<
+
+## end engines_ob
+
+engines-install:
+	$(INSTALL) -d $(DESTDIR)$(enginedir)/
+	$(LIBTOOL) --mode=install $(INSTALL) $(engines_ob_target) \
+		$(DESTDIR)$(enginedir)/$(notdir $(engines_ob_target))
+	$(LIBTOOL) --mode=finish $(DESTDIR)$(enginedir)
+
+engines-uninstall:
+	$(LIBTOOL) --mode=uninstall $(RM) \
+		$(DESTDIR)$(enginedir)/$(notdir $(engines_ob_target))
+	-rmdir $(DESTDIR)$(enginedir)/
+
+engines-clean:
+	$(RM) $(engines_ob_target) $(engines_ob_objects)
+	$(RM) $(engines_ob_dir)/*\~
+
+-include $(engines_ob_deps)
+
+.PHONY: engines-install engines-uninstall engines-clean
diff --git a/build/Makefile.incl.in b/build/Makefile.incl.in
new file mode 100644
index 00000000..6bdf7082
--- /dev/null
+++ b/build/Makefile.incl.in
@@ -0,0 +1,44 @@
+CFLAGS = @CFLAGS@
+CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@ \
+  -DLOCALEDIR=\"$(localedir)\" \
+  -DRCDIR=\"$(rcdir)\" \
+  -DPLUGINDIR=\"$(plugindir)\" \
+  -DENGINEDIR=\"$(enginedir)\" \
+  -DDEFAULT_ENGINE=\"openbox\" \
+  -DBINARY=\"$(binary)\"
+DEFS = @DEFS@
+LIBS = @LIBS@
+
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@ -DG_DISABLE_DEPRECATED
+
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@ -DG_DISABLE_DEPRECATED
+
+XFT_CFLAGS = @XFT_CFLAGS@
+XFT_LIBS = @XFT_LIBS@
+
+FLEX = @FLEX@
+BISON = @BISON@
+INSTALL = @INSTALL@
+LIBTOOL = @LIBTOOL@
+
+srcdir = @srcdir@
+# non-recursive!
+top_builddir = .
+
+prefix ?= @prefix@
+exec_prefix ?= @exec_prefix@
+
+bindir ?= @bindir@
+libdir ?= @libdir@
+includedir ?= @includedir@
+datadir ?= @datadir@
+
+localedir = $(datadir)/locale
+enginedir = $(libdir)/openbox/engines
+plugindir = $(libdir)/openbox/plugins
+rcdir = $(datadir)/openbox
+themesdir = $(datadir)/openbox/themes
+
+binary = openbox3
diff --git a/build/Makefile.kernel b/build/Makefile.kernel
new file mode 100644
index 00000000..10a8268e
--- /dev/null
+++ b/build/Makefile.kernel
@@ -0,0 +1,62 @@
+kernel_dir:=kernel
+kernel_target:=$(binary)
+kernel_sources:=action.c client.c config.c dispatch.c engine.c event.c \
+                extensions.c focus.c frame.c grab.c menu.c openbox.c \
+                parse.c plugin.c prop.c screen.c stacking.c timer.c xerror.c \
+                lex.yy.c parse.tab.c
+kernel_lex:=parse.l
+kernel_yacc:=parse.y
+kernel_CPPFLAGS:=$(CPPFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(XFT_CFLAGS) \
+  -DG_LOG_DOMAIN=\"Openbox\"
+kernel_LIBS:=$(LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) $(XFT_LIBS)
+kernel_LDFLAGS:=-export-dynamic
+
+kernel_srcdir:=$(srcdir)/$(kernel_dir)
+kernel_lex:=$(addprefix $(kernel_srcdir)/,$(kernel_lex))
+kernel_yacc:=$(addprefix $(kernel_srcdir)/,$(kernel_yacc))
+kernel_target:=$(addprefix $(kernel_dir)/,$(kernel_target))
+kernel_objects:=$(addprefix $(kernel_dir)/,$(kernel_sources:.c=.o))
+kernel_sources:=$(addprefix $(kernel_srcdir)/,$(kernel_sources))
+kernel_deps:=$(addprefix $(depdir)/,$(kernel_objects:.o=.d))
+kernel_depdir:=$(depdir)/$(kernel_dir)
+
+$(kernel_target): $(kernel_objects) $(render_target)
+	$(LIBTOOL) --mode=link $(CC) -o $@ $^ $(kernel_LIBS) $(kernel_LDFLAGS)
+
+$(kernel_dir):
+	@mkdir $@
+
+$(kernel_dir)/%.o: $(kernel_srcdir)/%.c $(kernel_depdir)/%.d
+	$(CC) $(DEFS) $(kernel_CPPFLAGS) $(CFLAGS) -c -o $@ $<
+
+$(kernel_dir)/lex.yy.c: $(kernel_lex)
+	cd kernel && \
+	$(FLEX) $(notdir $<)
+
+%.tab.h: %.tab.c
+
+$(kernel_dir)/%.tab.c: $(kernel_srcdir)/%.y
+	cd kernel && \
+	$(BISON) -d $(notdir $<)
+
+$(kernel_depdir)/%.d: $(kernel_srcdir)/%.c $(depdir)
+	@echo Building dependancies for $<
+	@mkdir $(dir $@) 2> /dev/null || true
+	@$(CC) $(kernel_CPPFLAGS) $(CFLAGS) -w -MM -MF $@ -MQ $(<:.c=.o) $<
+
+kernel-install:
+	$(INSTALL) -d $(DESTDIR)$(bindir)/
+	$(INSTALL) $(kernel_target) $(DESTDIR)$(bindir)/$(notdir $(kernel_target))
+
+kernel-uninstall:
+	-$(RM) $(DESTDIR)$(bindir)/$(notdir $(kernel_target))
+	-rmdir $(DESTDIR)$(bindir)/
+
+kernel-clean:
+	$(RM) $(kernel_target) $(kernel_objects) $(kernel_dir)/*\~
+	$(RM) $(kernel_srcdir)/lex.yy.c
+	$(RM) $(kernel_yacc:.y=.tab.c) $(kernel_yacc:.y=.tab.h)
+
+-include $(kernel_deps)
+
+.PHONY: kernel-install kernel-uninstall kernel-clean
diff --git a/build/Makefile.plugins b/build/Makefile.plugins
new file mode 100644
index 00000000..ba23c556
--- /dev/null
+++ b/build/Makefile.plugins
@@ -0,0 +1,96 @@
+plugins_dir:=plugins
+plugins_srcdir:=$(srcdir)/$(plugins_dir)
+
+plugins_resistance_dir:=$(plugins_dir)
+plugins_resistance_srcdir:=$(plugins_srcdir)
+plugins_resistance_target:=resistance.la
+plugins_resistance_sources:=resistance.c
+plugins_resistance_CPPFLAGS:=$(CPPFLAGS) $(GLIB_CFLAGS) $(XFT_CFLAGS) \
+  -DG_LOG_DOMAIN=\"Plugin-Resistance\"
+
+plugins_placement_dir:=$(plugins_dir)/placement
+plugins_placement_srcdir:=$(plugins_srcdir)/placement
+plugins_placement_target:=placement.la
+plugins_placement_sources:=placement.c history.c
+plugins_placement_CPPFLAGS:=$(CPPFLAGS) $(GLIB_CFLAGS) $(XFT_CFLAGS) \
+  -DG_LOG_DOMAIN=\"Plugin-Placement\"
+
+plugins_targets:=$(plugins_resistance_dir)/$(plugins_resistance_target)
+plugins_targets:=$(plugins_targets) $(plugins_placement_dir)/$(plugins_placement_target)
+
+plugins_resistance_objects:=$(addprefix $(plugins_resistance_dir)/,$(plugins_resistance_sources:.c=.lo))
+plugins_resistance_sources:=$(addprefix $(plugins_resistance_srcdir)/,$(plugins_resistance_sources))
+plugins_resistance_target:=$(addprefix $(plugins_resistance_dir)/,$(plugins_resistance_target))
+plugins_resistance_deps:=$(addprefix $(depdir)/,$(plugins_resistance_objects:.lo=.d))
+plugins_resistance_depdir:=$(depdir)/$(plugins_resistance_dir)
+
+plugins_placement_objects:=$(addprefix $(plugins_placement_dir)/,$(plugins_placement_sources:.c=.lo))
+plugins_placement_sources:=$(addprefix $(plugins_placement_srcdir)/,$(plugins_placement_sources))
+plugins_placement_target:=$(addprefix $(plugins_placement_dir)/,$(plugins_placement_target))
+plugins_placement_deps:=$(addprefix $(depdir)/,$(plugins_placement_objects:.lo=.d))
+plugins_placement_depdir:=$(depdir)/$(plugins_placement_dir)
+
+## plugins_resistance
+
+$(plugins_resistance_target): $(plugins_resistance_objects)
+	$(LIBTOOL) --mode=link $(CC) -rpath $(plugindir) $(plugins_resistance_CPPFLAGS) \
+		$(CFLAGS) -module -avoid-version -o $@ $^
+
+$(plugins_resistance_dir):
+	@mkdir $@
+
+$(plugins_resistance_dir)/%.lo: $(plugins_resistance_srcdir)/%.c $(plugins_resistance_depdir)/%.d
+	$(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+		$(plugins_resistance_CPPFLAGS) $(CFLAGS) -c -o $@ $<
+
+$(plugins_resistance_depdir)/%.d: $(plugins_resistance_srcdir)/%.c $(depdir)
+	@echo Building dependancies for $<
+	@mkdir $(dir $@) 2> /dev/null || true
+	@$(CC) $(plugins_resistance_CPPFLAGS) $(CFLAGS) -w -MM -MF $@ -MQ $(<:.c=.lo) $<
+
+## end plugins_resistance
+
+## plugins_placement
+
+$(plugins_placement_target): $(plugins_placement_objects)
+	$(LIBTOOL) --mode=link $(CC) -rpath $(plugindir) $(plugins_placement_CPPFLAGS) \
+		$(CFLAGS) -module -avoid-version -o $@ $^
+
+$(plugins_placement_dir):
+	@mkdir $@
+
+$(plugins_placement_dir)/%.lo: $(plugins_placement_srcdir)/%.c $(plugins_placement_depdir)/%.d
+	$(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+		$(plugins_placement_CPPFLAGS) $(CFLAGS) -c -o $@ $<
+
+$(plugins_placement_depdir)/%.d: $(plugins_placement_srcdir)/%.c $(depdir)
+	@echo Building dependancies for $<
+	@mkdir $(dir $@) 2> /dev/null || true
+	@$(CC) $(plugins_placement_CPPFLAGS) $(CFLAGS) -w -MM -MF $@ -MQ $(<:.c=.lo) $<
+
+## end plugins_placement
+
+plugins-install:
+	$(INSTALL) -d $(DESTDIR)$(plugindir)/
+	$(LIBTOOL) --mode=install $(INSTALL) $(plugins_resistance_target) \
+		$(DESTDIR)$(plugindir)/$(notdir $(plugins_resistance_target))
+	$(LIBTOOL) --mode=install $(INSTALL) $(plugins_placement_target) \
+		$(DESTDIR)$(plugindir)/$(notdir $(plugins_placement_target))
+	$(LIBTOOL) --mode=finish $(DESTDIR)$(plugindir)
+
+plugins-uninstall:
+	$(LIBTOOL) --mode=uninstall $(RM) \
+		$(DESTDIR)$(plugindir)/$(notdir $(plugins_placement_target))
+	$(LIBTOOL) --mode=uninstall $(RM) \
+		$(DESTDIR)$(plugindir)/$(notdir $(plugins_resistance_target))
+	-rmdir $(DESTDIR)$(plugindir)/
+
+plugins-clean:
+	$(RM) $(plugins_resistance_target) $(plugins_resistance_objects)
+	$(RM) $(plugins_resistance_dir)/*\~
+	$(RM) $(plugins_placement_target) $(plugins_placement_objects)
+	$(RM) $(plugins_placement_dir)/*\~
+
+-include $(plugins_resistance_deps) $(plugins_placement_deps)
+
+.PHONY: plugins-install plugins-uninstall plugins-clean
diff --git a/build/Makefile.render b/build/Makefile.render
new file mode 100644
index 00000000..210ecdd9
--- /dev/null
+++ b/build/Makefile.render
@@ -0,0 +1,37 @@
+render_dir:=render
+render_target:=librender.a
+render_sources:=color.c font.c gradient.c image.c mask.c render.c test.c
+render_CPPFLAGS:=$(CPPFLAGS) $(GLIB_CFLAGS) $(XFT_CFLAGS) \
+  -DG_LOG_DOMAIN=\"Render\"
+
+render_srcdir:=$(srcdir)/$(render_dir)
+render_target:=$(addprefix $(render_dir)/,$(render_target))
+render_objects:=$(addprefix $(render_dir)/,$(render_sources:.c=.o))
+render_sources:=$(addprefix $(render_srcdir)/,$(render_sources))
+render_deps:=$(addprefix $(depdir)/,$(render_objects:.o=.d))
+render_depdir:=$(depdir)/$(render_dir)
+
+$(render_target): $(render_objects)
+	$(AR) r $@ $^
+
+$(render_dir):
+	@mkdir $@
+
+$(render_dir)/%.o: $(render_srcdir)/%.c $(depdir)/%.d
+	$(CC) $(DEFS) $(render_CPPFLAGS) $(CFLAGS) -c -o $@ $<
+
+$(render_depdir)/%.d: $(render_srcdir)/%.c $(render_depdir)
+	@echo Building dependancies for $<
+	@mkdir $(dir $@) 2> /dev/null || true
+	@$(CC) $(render_CPPFLAGS) $(CFLAGS) -w -MM -MF $@ -MQ $(<:.c=.o) $<
+
+render-install:
+
+render-uninstall:
+
+render-clean:
+	$(RM) $(render_target) $(render_objects) $(render_srcdir)/*\~
+
+-include $(render_deps)
+
+.PHONY: render-install render-uninstall render-clean
diff --git a/build/Makefile.themes b/build/Makefile.themes
new file mode 100644
index 00000000..5238c140
--- /dev/null
+++ b/build/Makefile.themes
@@ -0,0 +1,60 @@
+themes_srcdir:=$(srcdir)/themes
+
+themes_ob_dir:=$(DESTDIR)$(themesdir)/openbox
+themes_ob_srcdir:=$(themes_srcdir)/openbox
+themes_ob:=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
+
+themes_ob_fieron_buttons_dir:=$(themes_ob_dir)/fieron_buttons
+themes_ob_fieron_buttons_srcdir:=$(themes_ob_srcdir)/fieron_buttons
+themes_ob_fieron_buttons:=close.xbm icon.xbm max.xbm stick.xbm
+
+themes_ob_fieron2_buttons_dir:=$(themes_ob_dir)/fieron2_buttons
+themes_ob_fieron2_buttons_srcdir:=$(themes_ob_srcdir)/fieron2_buttons
+themes_ob_fieron2_buttons:=close.xbm icon.xbm max.xbm stick.xbm
+
+themes_ob_ebox_buttons_dir:=$(themes_ob_dir)/ebox_buttons
+themes_ob_ebox_buttons_srcdir:=$(themes_ob_srcdir)/ebox_buttons
+themes_ob_ebox_buttons:=close.xbm icon.xbm max.xbm
+
+themes-install:
+	$(INSTALL) -d $(DESTDIR)$(themesdir)
+
+	$(INSTALL) -d $(themes_ob_dir)
+	for i in $(addprefix $(themes_ob_srcdir)/,$(themes_ob)); do \
+		$(INSTALL) $$i $(themes_ob_dir); \
+	done
+	$(INSTALL) -d $(themes_ob_fieron_buttons_dir)
+	for i in $(addprefix $(themes_ob_fieron_buttons_srcdir)/,$(themes_ob_fieron_buttons)); do \
+		$(INSTALL) $$i $(themes_ob_fieron_buttons_dir); \
+	done
+	$(INSTALL) -d $(themes_ob_fieron2_buttons_dir)
+	for i in $(addprefix $(themes_ob_fieron2_buttons_srcdir)/,$(themes_ob_fieron2_buttons)); do \
+		$(INSTALL) $$i $(themes_ob_fieron2_buttons_dir); \
+	done
+	$(INSTALL) -d $(themes_ob_ebox_buttons_dir)
+	for i in $(addprefix $(themes_ob_ebox_buttons_srcdir)/,$(themes_ob_ebox_buttons)); do \
+		$(INSTALL) $$i $(themes_ob_ebox_buttons_dir); \
+	done
+
+themes-uninstall:
+	-for i in $(themes_ob_ebox_buttons); do \
+		$(RM) $(themes_ob_ebox_buttons_dir)/$$i; \
+	done
+	-rmdir $(themes_ob_ebox_buttons_dir)
+	-for i in $(themes_ob_fieron2_buttons); do \
+		$(RM) $(themes_ob_fieron2_buttons_dir)/$$i; \
+	done
+	-rmdir $(themes_ob_fieron2_buttons_dir)
+	-for i in $(themes_ob_fieron_buttons); do \
+		$(RM) $(themes_ob_fieron_buttons_dir)/$$i; \
+	done
+	-rmdir $(themes_ob_fieron_buttons_dir)
+	-for i in $(themes_ob); do \
+		$(RM) $(themes_ob_dir)/$$i; \
+	done
+	-rmdir $(themes_ob_dir)
+
+	-rmdir $(DESTDIR)$(themesdir)