Some menu updates.

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 059255046de67d193cc89e6b1ec5832f069a5cc0..3b6f19ff840a878854f6d85808d3d499c2dda718 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,8 @@ plugin_LTLIBRARIES = \
        plugins/keyboard/keyboard.la \
        plugins/menu/timed_menu.la \
        plugins/menu/fifo_menu.la \
-       plugins/menu/client_menu.la
+       plugins/menu/client_menu.la \
+       plugins/menu/include_menu.la
 
 if OBCONF
 plugin_LTLIBRARIES += \
@@ -168,6 +169,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 \
@@ -309,8 +312,21 @@ plugins_menu_client_menu_la_LDFLAGS = \
        -module \
        -avoid-version
 plugins_menu_client_menu_la_SOURCES = \
-       plugins/menu/client_menu.c \
-       plugins/menu/client_menu.h
+       plugins/menu/client_menu.c
+
+plugins_menu_include_menu_la_CPPFLAGS = \
+       $(XFT_CFLAGS) \
+       $(GLIB_CFLAGS) \
+       $(LIBSN_CFLAGS) \
+       $(XML_CFLAGS) \
+       -DPLUGINDIR=\"$(plugindir)\" \
+       -DG_LOG_DOMAIN=\"Plugin-Include-Menu\"
+plugins_menu_include_menu_la_LDFLAGS = \
+       -module \
+       -avoid-version
+plugins_menu_include_menu_la_SOURCES = \
+       plugins/menu/include_menu.c
+
 
 ## themes ##
 
@@ -373,7 +389,8 @@ EXTRA_DIST = \
        mkinstalldirs \
        README \
        COPYING \
-       AUTHOR
+       AUTHORS \
+       plugins/obconf_interface.h
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc
@@ -381,7 +398,7 @@ EXTRA_DIST = \
 distclean-local:
        for d in . m4 po render; do \
                for p in core core.* gmon.out *\~ *.orig *.rej .\#*; do \
-                       $(RM) "$$d/$$p"; \
+                       rm -f "$$d/$$p"; \
                done \
        done