Menu data structures basically completed.

[chaz/openbox] / openbox / Makefile.am

diff --git a/openbox/Makefile.am b/openbox/Makefile.am
index 758d399813ddb9cf9df0b893e89d18837dda9fc2..d691cbcdcd5f8b08583360e677438e666af76965 100644 (file)
--- a/openbox/Makefile.am
+++ b/openbox/Makefile.am
@@ -1,5 +1,4 @@
 localedir=$(datadir)/locale
-themercdir=$(datadir)/openbox
 enginedir=$(libdir)/openbox/engines
 plugindir=$(libdir)/openbox/plugins
 rcdir=$(datadir)/openbox
@@ -11,7 +10,6 @@ bugurl=http://bugzilla.icculus.org
 CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) \
 @CPPFLAGS@ \
 -DLOCALEDIR=\"$(localedir)\" \
--DTHEMERCDIR=\"$(themercdir)\" \
 -DRCDIR=\"$(rcdir)\" \
 -DPLUGINDIR=\"$(plugindir)\" \
 -DENGINEDIR=\"$(enginedir)\" \
@@ -28,12 +26,15 @@ 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 cparse.l config.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 config.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