X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2FMakefile.am;h=f5b67f5007d50d9d5bd0d71c0d2f9a1d8996c940;hb=5e3ab28bab78e07553b7b44fe7c7c7b20c9d2fd3;hp=254025baed8c56700c5aa11e18ebe03c8d567785;hpb=17cc975cc9116a64bc4313324a507485ee669128;p=chaz%2Fopenbox

diff --git a/openbox/Makefile.am b/openbox/Makefile.am
index 254025ba..f5b67f50 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 snap.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
 
 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 snap.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
+
+lex.cparse.c: cparse.l
+	$(FLEX) -Pcparse $^
 
 MAINTAINERCLEANFILES= Makefile.in