X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2FMakefile.am;h=d691cbcdcd5f8b08583360e677438e666af76965;hb=a116f2c6310db702e377e9cd1a95c9a980aba5ae;hp=97ec6c1d671379f0255ff2e9cabf1d9a79f55748;hpb=c2cbef62bb5d7e0c3f8c00e95bc885dc1f9ab1da;p=chaz%2Fopenbox

diff --git a/openbox/Makefile.am b/openbox/Makefile.am
index 97ec6c1d..d691cbcd 100644
--- a/openbox/Makefile.am
+++ b/openbox/Makefile.am
@@ -1,16 +1,16 @@
 localedir=$(datadir)/locale
-themercdir=$(datadir)/openbox
 enginedir=$(libdir)/openbox/engines
 plugindir=$(libdir)/openbox/plugins
+rcdir=$(datadir)/openbox
 
-binary=ob3
+binary=openbox3
 url=http://icculus.org/openbox
 bugurl=http://bugzilla.icculus.org
 
 CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) \
 @CPPFLAGS@ \
 -DLOCALEDIR=\"$(localedir)\" \
--DTHEMERCDIR=\"$(themercdir)\" \
+-DRCDIR=\"$(rcdir)\" \
 -DPLUGINDIR=\"$(plugindir)\" \
 -DENGINEDIR=\"$(enginedir)\" \
 -DDEFAULT_ENGINE=\"openbox\" \
@@ -23,15 +23,18 @@ LIBS=$(XFT_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) @LIBS@
 
 bin_PROGRAMS=$(binary)
 
-ob3_LDADD=@LIBINTL@ ../render/librender.a
-ob3_LDFLAGS=-export-dynamic
-ob3_SOURCES=client.c event.c extensions.c focus.c frame.c openbox.c prop.c \
-	screen.c stacking.c xerror.c themerc.c timer.c dispatch.c \
-	engine.c plugin.c action.c grab.c
+openbox3_LDADD=@LIBINTL@ ../render/librender.a
+openbox3_LDFLAGS=-export-dynamic
+openbox3_SOURCES=client.c event.c extensions.c focus.c frame.c openbox.c \
+	prop.c screen.c stacking.c xerror.c timer.c dispatch.c \
+	engine.c plugin.c action.c grab.c lex.cparse.c config.c menu.c
 
 noinst_HEADERS=client.h event.h extensions.h focus.h frame.h geom.h gettext.h \
-	openbox.h prop.h screen.h stacking.h xerror.h themerc.h dispatch.h \
-	timer.h engine.h plugin.h action.h grab.h
+	openbox.h prop.h screen.h stacking.h xerror.h dispatch.h \
+	timer.h engine.h plugin.h action.h grab.h config.h menu.h
+
+lex.cparse.c: cparse.l
+	$(FLEX) -Pcparse $^
 
 MAINTAINERCLEANFILES= Makefile.in