Close menu properly on unbound keys.

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5aa0fe1d6732832867b1a9e5d841b77b2355ff9f..f84dc6fe14d47346a761fd06239f6af0777274e7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,7 @@ localedir       = $(datadir)/locale
 rcdir           = $(datadir)/openbox
 plugindir       = $(libdir)/openbox/plugins
 desktopfilesdir = $(datadir)/gnome/wm-properties
+pixmapdir       = $(datadir)/pixmaps
 
 theme = operation
 
@@ -34,8 +35,11 @@ plugin_LTLIBRARIES = \
        plugins/menu/include_menu.la
 
 if OBCONF
-plugin_LTLIBRARIES += \
-       plugins/resistance/resistance-config.la
+bin_PROGRAMS += \
+       tools/obconf/obconf
+
+#plugin_LTLIBRARIES += \
+#      plugins/resistance/resistance-config.la
 endif
 
 ## render ##
@@ -169,6 +173,8 @@ kernel_openbox_SOURCES = \
        kernel/prop.h \
        kernel/screen.c \
        kernel/screen.h \
+       kernel/session.c \
+       kernel/session.h \
        kernel/stacking.c \
        kernel/stacking.h \
        kernel/startup.c \
@@ -326,6 +332,28 @@ plugins_menu_include_menu_la_SOURCES = \
        plugins/menu/include_menu.c
 
 
+## obconf ##
+
+tools_obconf_obconf_CPPFLAGS = \
+       $(GTK_CFLAGS) \
+       $(GDK_PIXBUF_CFLAGS) \
+       $(XML_CFLAGS) \
+       -DLOCALEDIR=\"$(localedir)\" \
+       -DPLUGINDIR=\"$(plugindir)\" \
+       -DRCDIR=\"$(rcdir)\" \
+       -DPIXMAPDIR=\"$(pixmapdir)\" \
+       -DG_LOG_DOMAIN=\"Obconf\"
+tools_obconf_obconf_LDADD = \
+       $(GTK_LIBS) \
+       $(GDK_PIXBUF_LIBS) \
+       $(LIBINTL) \
+       render/libobrender.la \
+       parser/libobparser.la
+tools_obconf_obconf_SOURCES = \
+       gettext.h \
+       tools/obconf/main.c
+
+
 ## themes ##
 
 dist_theme_DATA = \