X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=f84dc6fe14d47346a761fd06239f6af0777274e7;hb=dd33644de425ce545f17e9fc0f8ead05aa5bc01f;hp=cdf5e4edd68ed11c68bfc0ef5dd4e51409dcc738;hpb=2abbf01125731caf99490eca58db6debce717947;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index cdf5e4ed..f84dc6fe 100644
--- 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
 
@@ -30,11 +31,15 @@ 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 += \
-	plugins/resistance/resistance-config.la
+bin_PROGRAMS += \
+	tools/obconf/obconf
+
+#plugin_LTLIBRARIES += \
+#	plugins/resistance/resistance-config.la
 endif
 
 ## render ##
@@ -154,8 +159,10 @@ kernel_openbox_SOURCES = \
 	kernel/menu.c \
 	kernel/menu.h \
 	kernel/menu_render.c \
+	kernel/misc.h \
 	kernel/moveresize.c \
 	kernel/moveresize.h \
+	kernel/mwm.h \
 	kernel/openbox.c \
 	kernel/openbox.h \
 	kernel/plugin.c \
@@ -166,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 \
@@ -307,8 +316,43 @@ 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
+
+
+## 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 ##
 
@@ -371,7 +415,8 @@ EXTRA_DIST = \
 	mkinstalldirs \
 	README \
 	COPYING \
-	AUTHOR
+	AUTHORS \
+	plugins/obconf_interface.h
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc
@@ -379,7 +424,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