X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2FMakefile.am;h=14383a83fe810bdbfe45d22f3b257614bfca21ef;hb=08a70966ee8fdec4204ab1ca9aed1371b1c828d0;hp=b1055d701bad698f60b77d0ce909462f488d69f4;hpb=624d277ffbd877d0408ad7c3789e6f6224b5dfee;p=chaz%2Fopenbox

diff --git a/openbox/Makefile.am b/openbox/Makefile.am
index b1055d70..14383a83 100644
--- a/openbox/Makefile.am
+++ b/openbox/Makefile.am
@@ -1,7 +1,7 @@
 localedir=$(datadir)/locale
-themercdir=$(datadir)/openbox
 enginedir=$(libdir)/openbox/engines
 plugindir=$(libdir)/openbox/plugins
+rcdir=$(datadir)/openbox
 
 binary=openbox3
 url=http://icculus.org/openbox
@@ -10,7 +10,7 @@ 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\" \
@@ -26,12 +26,12 @@ bin_PROGRAMS=$(binary)
 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 themerc.c timer.c dispatch.c \
-	engine.c plugin.c action.c grab.c
+	prop.c screen.c stacking.c xerror.c timer.c dispatch.c \
+	engine.c plugin.c action.c grab.c cparse.l 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
+	openbox.h prop.h screen.h stacking.h xerror.h dispatch.h \
+	timer.h engine.h plugin.h action.h grab.h config.h
 
 MAINTAINERCLEANFILES= Makefile.in