3 files changed, 51 insertions, 4 deletions
diff --git a/openbox/.cvsignore b/openbox/.cvsignore
index b4b3cfc3..ee6225ab 100644
--- a/openbox/.cvsignore
+++ b/openbox/.cvsignore
@@ -26,3 +26,5 @@ screen.lo
 stacking.lo
 timer.lo
 xerror.lo
+Makefile.in
+.deps
diff --git a/openbox/Makefile b/openbox/Makefile
deleted file mode 100644
index 56263a4a..00000000
--- a/openbox/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all clean distclean install uninstall:
-	$(MAKE) -$(MAKEFLAGS) -C .. $@
-
-.PHONY: all clean distclean install uninstall
diff --git a/openbox/Makefile.am b/openbox/Makefile.am
new file mode 100644
index 00000000..5c5d39d8
--- /dev/null
+++ b/openbox/Makefile.am
@@ -0,0 +1,49 @@
+localedir=$(datadir)/locale
+plugindir=$(libdir)/openbox/plugins
+rcdir=$(datadir)/openbox
+
+binary=openbox3
+url=http://icculus.org/openbox
+
+CPPFLAGS=$(X_CFLAGS) $(XFT_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) \
+          @CPPFLAGS@ \
+         -DLOCALEDIR=\"$(localedir)\" \
+         -DRCDIR=\"$(rcdir)\" \
+         -DPLUGINDIR=\"$(plugindir)\" \
+         -DG_LOG_DOMAIN=\"Openbox\" \
+         -DBINARY=\"$(binary)\"
+
+INCLUDES=-I..
+LIBS=$(X_LIBS) $(XFT_LIBS) $(XINERAMA_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) @LIBS@
+
+bin_PROGRAMS=$(binary)
+
+openbox3_LDADD=@LIBINTL@ -lobrender -L../render
+openbox3_LDFLAGS=-export-dynamic
+openbox3_SOURCES=parse.tab.c parse.lex.c action.c client.c config.c \
+                 extensions.c focus.c frame.c grab.c menu.c openbox.c \
+                 framerender.c parse.c plugin.c prop.c screen.c stacking.c \
+                 dispatch.c event.c group.c timer.c xerror.c 
+
+noinst_HEADERS=action.h client.h config.h dispatch.h event.h extensions.h \
+               focus.h frame.h framerender.h geom.h gettext.h grab.h group.h \
+               menu.h openbox.h parse.h parse.tab.h plugin.h prop.h screen.h \
+               stacking.h timer.h xerror.h
+
+# kill the implicit .c.y rule
+%.c: %.y
+	@
+
+%.lex.c: %.l
+	$(FLEX) -o$@ $<
+
+%.tab.c: %.y
+	$(BISON) -d -o $@ $<
+
+MAINTAINERCLEANFILES=Makefile.in
+
+clean-local:
+	$(RM) parse.lex.c parse.tab.c parse.tab.h
+
+distclean-local:
+	$(RM) *\~ *.orig *.rej .\#*