X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=ae8cf62e23fb71affcce9b6bae3f9af4fa25341a;hb=cadab91e522c6426cc79df4f06e7c05232cb0a64;hp=cb82d10f9c523865e1e2d4ca631ebdd263f250b0;hpb=c90da6da781932c2d178bfb7e39ec1d5003543b7;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index cb82d10f..ae8cf62e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,19 +26,16 @@ bin_PROGRAMS = \
 	tools/kdetrayproxy/kdetrayproxy
 
 plugin_LTLIBRARIES = \
-	plugins/resistance/resistance.la \
 	plugins/placement/placement.la \
 	plugins/menu/timed_menu.la \
 	plugins/menu/fifo_menu.la \
 	plugins/menu/client_menu.la \
-	plugins/menu/include_menu.la
+	plugins/menu/include_menu.la \
+	plugins/menu/client_list_menu.la
 
 if OBCONF
 bin_PROGRAMS += \
 	tools/obconf/obconf
-
-#plugin_LTLIBRARIES += \
-#	plugins/resistance/resistance-config.la
 endif
 
 ## render ##
@@ -176,6 +173,8 @@ kernel_openbox_SOURCES = \
 	kernel/popup.h \
 	kernel/prop.c \
 	kernel/prop.h \
+	kernel/resist.c \
+	kernel/resist.h \
 	kernel/screen.c \
 	kernel/screen.h \
 	kernel/session.c \
@@ -194,39 +193,6 @@ kernel_openbox_SOURCES = \
 	kernel/xerror.h \
 	plugins/interface.h
 
-## plugins/resistance ##
-
-plugins_resistance_resistance_la_CPPFLAGS = \
-	$(XFT_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(LIBSN_CFLAGS) \
-	$(XML_CFLAGS) \
-	-DPLUGINDIR=\"$(plugindir)\" \
-	-DG_LOG_DOMAIN=\"Plugin-Resistance\"
-plugins_resistance_resistance_la_LDFLAGS = \
-	-module \
-	-avoid-version
-plugins_resistance_resistance_la_SOURCES = \
-	plugins/resistance/resistance.c \
-	plugins/resistance/resistance.h
-
-if OBCONF
-plugins_resistance_resistance_config_la_CPPFLAGS = \
-	$(XFT_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(LIBSN_CFLAGS) \
-	$(XML_CFLAGS) \
-	-DPLUGINDIR=\"$(plugindir)\" \
-	-DG_LOG_DOMAIN=\"Plugin-Resistance\" \
-	$(GTK_CFLAGS) \
-	$(GLADE_CFLAGS)
-plugins_resistance_resistance_config_la_LDFLAGS = \
-	-module \
-	-avoid-version
-plugins_resistance_resistance_config_la_SOURCES = \
-	plugins/resistance/resistance_config.c
-endif
-
 ## plugins/placement ##
 
 plugins_placement_placement_la_CPPFLAGS = \
@@ -300,6 +266,19 @@ plugins_menu_include_menu_la_LDFLAGS = \
 plugins_menu_include_menu_la_SOURCES = \
 	plugins/menu/include_menu.c
 
+plugins_menu_client_list_menu_la_CPPFLAGS = \
+	$(XFT_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(LIBSN_CFLAGS) \
+	$(XML_CFLAGS) \
+	-DPLUGINDIR=\"$(plugindir)\" \
+	-DG_LOG_DOMAIN=\"Plugin-Client-List-Menu\"
+plugins_menu_client_list_menu_la_LDFLAGS = \
+	-module \
+	-avoid-version
+plugins_menu_client_list_menu_la_SOURCES = \
+	plugins/menu/client_list_menu.c
+
 
 ## obconf ##
 
@@ -414,7 +393,8 @@ dist_om4ob_theme_DATA = \
 ## data ##
 
 dist_rc_DATA = \
-	data/rc3
+	data/rc3 \
+	data/menu
 
 dist_desktopfiles_DATA = \
 	data/openbox.desktop