X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=b879c0178e76722a8ccef8d9b10ee93d8ee604da;hb=526560b8a0871cd93f27c32442b3e470ec42ecb3;hp=f84dc6fe14d47346a761fd06239f6af0777274e7;hpb=a354b0f5a93b711c0eb70d52ba8fe5b42ff4ae36;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index f84dc6fe..b879c017 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,67 +1,67 @@
 SUBDIRS = m4 po
 
-themedir        = $(datadir)/openbox/themes
+themedir        = $(datadir)/themes
 localedir       = $(datadir)/locale
-rcdir           = $(datadir)/openbox
-plugindir       = $(libdir)/openbox/plugins
+configdir       = $(sysconfdir)/xdg
+rcdir           = $(configdir)/openbox
 desktopfilesdir = $(datadir)/gnome/wm-properties
+pkgconfigdir    = $(libdir)/pkgconfig
+pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir       = $(datadir)/pixmaps
+xsddir          = $(datadir)/openbox
 
-theme = operation
+theme = Clearlooks
+
+AUTOMAKE_OPTIONS = subdir-objects foreign
 
-AUTOMAKE_OPTIONS = subdir-objects
 ACLOCAL_AMFLAGS = -I m4
 
 INCLUDES = -I.
 
-noinst_PROGRAMS = \
+check_PROGRAMS = \
 	render/rendertest
 
 lib_LTLIBRARIES = \
-	render/libobrender.la \
-	parser/libobparser.la
+	parser/libobparser.la \
+	render/libobrender.la
 
 bin_PROGRAMS = \
-	kernel/openbox
-
-plugin_LTLIBRARIES = \
-	plugins/resistance/resistance.la \
-	plugins/placement/placement.la \
-	plugins/mouse/mouse.la \
-	plugins/keyboard/keyboard.la \
-	plugins/menu/timed_menu.la \
-	plugins/menu/fifo_menu.la \
-	plugins/menu/client_menu.la \
-	plugins/menu/include_menu.la
-
-if OBCONF
-bin_PROGRAMS += \
-	tools/obconf/obconf
-
-#plugin_LTLIBRARIES += \
-#	plugins/resistance/resistance-config.la
-endif
+	openbox/openbox \
+	tools/gnome-panel-control/gnome-panel-control
+
+noinst_PROGRAMS = \
+	tools/themetoxml/themetoxml
 
 ## render ##
 
 render_rendertest_CPPFLAGS = \
-	$(XFT_CFLAGS) \
+	$(PANGO_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\"RenderTest\"
-render_rendertest_LDADD = render/libobrender.la
+render_rendertest_LDADD = \
+	parser/libobparser.la \
+	render/libobrender.la \
+	$(GLIB_LIBS) \
+	$(PANGO_LIBS) \
+	$(XML_LIBS) \
+	$(X_LIBS)
 render_rendertest_SOURCES = render/test.c
 
 render_libobrender_la_CPPFLAGS = \
 	$(X_CFLAGS) \
-	$(XFT_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	$(XML_CFLAGS) \
+	$(PANGO_CFLAGS) \
 	-DG_LOG_DOMAIN=\"ObRender\" \
-	-DDEFAULT_THEME=\"$(theme)\" \
-	-DTHEMEDIR=\"$(themedir)\"
+	-DDEFAULT_THEME=\"$(theme)\"
+render_libobrender_la_LDFLAGS = \
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 render_libobrender_la_LIBADD = \
+	parser/libobparser.la \
 	$(X_LIBS) \
-	$(XFT_LIBS) \
-	$(GLIB_LIBS)
+	$(PANGO_LIBS) \
+	$(GLIB_LIBS) \
+	$(XML_LIBS)
 render_libobrender_la_SOURCES = \
 	gettext.h \
 	render/color.h \
@@ -71,6 +71,7 @@ render_libobrender_la_SOURCES = \
 	render/geom.h \
 	render/gradient.h \
 	render/gradient.c \
+	render/icon.h \
 	render/image.h \
 	render/image.c \
 	render/instance.h \
@@ -89,334 +90,341 @@ parser_libobparser_la_CPPFLAGS = \
 	$(XML_CFLAGS) \
 	-DG_LOG_DOMAIN=\"ObParser\" \
 	-DLOCALEDIR=\"$(localedir)\" \
-	-DRCDIR=\"$(rcdir)\"
+	-DDATADIR=\"$(datadir)\" \
+	-DCONFIGDIR=\"$(configdir)\"
+parser_libobparser_la_LDFLAGS = \
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 parser_libobparser_la_LIBADD = \
 	$(GLIB_LIBS) \
-	$(XML_LIBS)
+	$(XML_LIBS) 
 parser_libobparser_la_SOURCES = \
 	parser/parse.h \
 	parser/parse.c
 
-## kernel ##
+## openbox ##
 
-kernel_openbox_CPPFLAGS = \
+openbox_openbox_CPPFLAGS = \
+	$(SM_CFLAGS) \
+	$(XINERAMA_CFLAGS) \
+	$(XKB_CFLAGS) \
+	$(XRANDR_CFLAGS) \
+	$(XSHAPE_CFLAGS) \
+	$(XSYNC_CFLAGS) \
 	$(X_CFLAGS) \
+	$(XCURSOR_CFLAGS) \
 	$(SM_CFLAGS) \
-	$(XFT_CFLAGS) \
+	$(PANGO_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GMODULE_CFLAGS) \
 	$(LIBSN_CFLAGS) \
 	$(XML_CFLAGS) \
 	-DLOCALEDIR=\"$(localedir)\" \
-	-DPLUGINDIR=\"$(plugindir)\" \
-	-DRCDIR=\"$(rcdir)\" \
+	-DDATADIR=\"$(datadir)\" \
+	-DCONFIGDIR=\"$(configdir)\" \
 	-DG_LOG_DOMAIN=\"Openbox\"
-kernel_openbox_LDADD = \
+openbox_openbox_LDADD = \
 	$(SM_LIBS) \
 	$(XINERAMA_LIBS) \
 	$(XKB_LIBS) \
 	$(XRANDR_LIBS) \
-	$(VIDMODE_LIBS) \
 	$(XSHAPE_LIBS) \
+	$(XSYNC_LIBS) \
 	$(GLIB_LIBS) \
-	$(GMODULE_LIBS) \
+	$(X_LIBS) \
+	$(XCURSOR_LIBS) \
 	$(LIBSN_LIBS) \
 	$(XML_LIBS) \
 	$(EFENCE_LIBS) \
 	$(LIBINTL) \
 	render/libobrender.la \
 	parser/libobparser.la
-kernel_openbox_LDFLAGS = -export-dynamic
-kernel_openbox_SOURCES = \
+openbox_openbox_LDFLAGS = -export-dynamic
+openbox_openbox_SOURCES = \
 	gettext.h \
-	kernel/action.c \
-	kernel/action.h \
-	kernel/client.c \
-	kernel/client.h \
-	kernel/config.c \
-	kernel/config.h \
-	kernel/debug.c \
-	kernel/debug.h \
-	kernel/dispatch.c \
-	kernel/dispatch.h \
-	kernel/dock.c \
-	kernel/dock.h \
-	kernel/event.c \
-	kernel/event.h \
-	kernel/extensions.c \
-	kernel/extensions.h \
-	kernel/focus.c \
-	kernel/focus.h \
-	kernel/frame.c \
-	kernel/frame.h \
-	kernel/framerender.c \
-	kernel/framerender.h \
-	kernel/geom.h \
-	kernel/grab.c \
-	kernel/grab.h \
-	kernel/group.c \
-	kernel/group.h \
-	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 \
-	kernel/plugin.h \
-	kernel/popup.c \
-	kernel/popup.h \
-	kernel/prop.c \
-	kernel/prop.h \
-	kernel/screen.c \
-	kernel/screen.h \
-	kernel/session.c \
-	kernel/session.h \
-	kernel/stacking.c \
-	kernel/stacking.h \
-	kernel/startup.c \
-	kernel/startup.h \
-	kernel/timer.c \
-	kernel/timer.h \
-	kernel/window.c \
-	kernel/window.h \
-	kernel/xerror.c \
-	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 = \
-	$(XFT_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(LIBSN_CFLAGS) \
-	$(XML_CFLAGS) \
-	-DPLUGINDIR=\"$(plugindir)\" \
-	-DG_LOG_DOMAIN=\"Plugin-Placement\"
-plugins_placement_placement_la_LDFLAGS = \
-	-module \
-	-avoid-version
-plugins_placement_placement_la_SOURCES = \
-	plugins/placement/placement.c \
-	plugins/placement/history.c \
-	plugins/placement/history.h
-
-## plugins/mouse ##
-
-plugins_mouse_mouse_la_CPPFLAGS = \
-	$(XFT_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(LIBSN_CFLAGS) \
-	$(XML_CFLAGS) \
-	-DPLUGINDIR=\"$(plugindir)\" \
-	-DG_LOG_DOMAIN=\"Plugin-Mouse\"
-plugins_mouse_mouse_la_LDFLAGS = \
-	-module \
-	-avoid-version
-plugins_mouse_mouse_la_SOURCES = \
-	plugins/mouse/mouse.c \
-	plugins/mouse/mouse.h \
-	plugins/mouse/translate.c \
-	plugins/mouse/translate.h
-
-## plugins/mouse ##
-
-plugins_keyboard_keyboard_la_CPPFLAGS = \
-	$(XFT_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(LIBSN_CFLAGS) \
-	$(XML_CFLAGS) \
-	-DPLUGINDIR=\"$(plugindir)\" \
-	-DG_LOG_DOMAIN=\"Plugin-Keyboard\"
-plugins_keyboard_keyboard_la_LDFLAGS = \
-	-module \
-	-avoid-version
-plugins_keyboard_keyboard_la_SOURCES = \
-	plugins/keyboard/keyboard.c \
-	plugins/keyboard/keyboard.h \
-	plugins/keyboard/tree.c \
-	plugins/keyboard/tree.h \
-	plugins/keyboard/translate.c \
-	plugins/keyboard/translate.h
-
-## plugins/menu ##
-
-plugins_menu_timed_menu_la_CPPFLAGS = \
-	$(XFT_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(LIBSN_CFLAGS) \
-	$(XML_CFLAGS) \
-	-DPLUGINDIR=\"$(plugindir)\" \
-	-DG_LOG_DOMAIN=\"Plugin-Timed-Menu\"
-plugins_menu_timed_menu_la_LDFLAGS = \
-	-module \
-	-avoid-version
-plugins_menu_timed_menu_la_SOURCES = \
-	plugins/menu/timed_menu.c \
-	plugins/menu/timed_menu.h
-
-plugins_menu_fifo_menu_la_CPPFLAGS = \
-	$(XFT_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(LIBSN_CFLAGS) \
-	$(XML_CFLAGS) \
-	-DPLUGINDIR=\"$(plugindir)\" \
-	-DG_LOG_DOMAIN=\"Plugin-Fifo-Menu\"
-plugins_menu_fifo_menu_la_LDFLAGS = \
-	-module \
-	-avoid-version
-plugins_menu_fifo_menu_la_SOURCES = \
-	plugins/menu/fifo_menu.c \
-	plugins/menu/fifo_menu.h
-
-plugins_menu_client_menu_la_CPPFLAGS = \
-	$(XFT_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(LIBSN_CFLAGS) \
-	$(XML_CFLAGS) \
-	-DPLUGINDIR=\"$(plugindir)\" \
-	-DG_LOG_DOMAIN=\"Plugin-Client-Menu\"
-plugins_menu_client_menu_la_LDFLAGS = \
-	-module \
-	-avoid-version
-plugins_menu_client_menu_la_SOURCES = \
-	plugins/menu/client_menu.c
-
-plugins_menu_include_menu_la_CPPFLAGS = \
-	$(XFT_CFLAGS) \
+	openbox/action.c \
+	openbox/action.h \
+	openbox/client.c \
+	openbox/client.h \
+	openbox/client_list_menu.c \
+	openbox/client_list_menu.h \
+	openbox/client_list_combined_menu.c \
+	openbox/client_list_combined_menu.h \
+	openbox/client_menu.c \
+	openbox/client_menu.h \
+	openbox/config.c \
+	openbox/config.h \
+	openbox/debug.c \
+	openbox/debug.h \
+	openbox/dock.c \
+	openbox/dock.h \
+	openbox/event.c \
+	openbox/event.h \
+	openbox/extensions.c \
+	openbox/extensions.h \
+	openbox/focus.c \
+	openbox/focus.h \
+	openbox/frame.c \
+	openbox/frame.h \
+	openbox/framerender.c \
+	openbox/framerender.h \
+	openbox/geom.h \
+	openbox/grab.c \
+	openbox/grab.h \
+	openbox/group.c \
+	openbox/group.h \
+	openbox/keyboard.c \
+	openbox/keyboard.h \
+	openbox/keytree.c \
+	openbox/keytree.h \
+	openbox/mainloop.c \
+	openbox/mainloop.h \
+	openbox/menuframe.c \
+	openbox/menuframe.h \
+	openbox/menu.c \
+	openbox/menu.h \
+	openbox/misc.h \
+	openbox/modkeys.c \
+	openbox/modkeys.h \
+	openbox/mouse.c \
+	openbox/mouse.h \
+	openbox/moveresize.c \
+	openbox/moveresize.h \
+	openbox/mwm.h \
+	openbox/openbox.c \
+	openbox/openbox.h \
+	openbox/place.c \
+	openbox/place.h \
+	openbox/popup.c \
+	openbox/popup.h \
+	openbox/prop.c \
+	openbox/prop.h \
+	openbox/resist.c \
+	openbox/resist.h \
+	openbox/screen.c \
+	openbox/screen.h \
+	openbox/session.c \
+	openbox/session.h \
+	openbox/stacking.c \
+	openbox/stacking.h \
+	openbox/startupnotify.c \
+	openbox/startupnotify.h \
+	openbox/translate.c \
+	openbox/translate.h \
+	openbox/window.c \
+	openbox/window.h \
+	openbox/xerror.c \
+	openbox/xerror.h
+
+
+## themetoxml ##
+
+tools_themetoxml_themetoxml_CPPFLAGS = \
+	$(X_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
+	$(XML_CFLAGS)
+tools_themetoxml_themetoxml_LDADD = \
+	$(X_LIBS) \
+	$(GLIB_LIBS) \
+	$(XML_LIBS)
+tools_themetoxml_themetoxml_SOURCES = \
+	tools/themetoxml/themetoxml.c \
+	tools/themetoxml/rgb.h
 
 
-## obconf ##
+## gnome-panel-control ##
 
-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
+tools_gnome_panel_control_gnome_panel_control_CPPFLAGS = \
+	$(X_CFLAGS)
+tools_gnome_panel_control_gnome_panel_control_LDADD = \
+	$(X_LIBS)
+tools_gnome_panel_control_gnome_panel_control_SOURCES = \
+	tools/gnome-panel-control/gnome-panel-control.c
 
 
 ## themes ##
 
-dist_theme_DATA = \
-	themes/artwiz \
-	themes/bbs \
-	themes/bluebox \
-	themes/cthulhain \
-	themes/deep \
-	themes/ebox \
-	themes/fieron \
-	themes/fieron2 \
-	themes/flux \
-	themes/frobozz \
-	themes/frobust \
-	themes/mbdtex \
-	themes/miklos \
-	themes/nyz \
-	themes/nyzclone \
-	themes/ob20 \
-	themes/operation \
-	themes/outcomes \
-	themes/paper \
-	themes/purplehaaze \
-	themes/shade \
-	themes/steelblue \
-	themes/steelblue2 \
-	themes/the_orange \
-	themes/trisb \
-	themes/twice \
-	themes/warp-xp
-
-fieronthemedir = $(themedir)/fieron_data
-dist_fierontheme_DATA = \
-	themes/fieron_data/close.xbm \
-	themes/fieron_data/iconify.xbm \
-	themes/fieron_data/max.xbm \
-	themes/fieron_data/stick.xbm
-
-fieron2themedir = $(themedir)/fieron2_data
-dist_fieron2theme_DATA = \
-	themes/fieron2_data/close.xbm \
-	themes/fieron2_data/iconify.xbm \
-	themes/fieron2_data/max.xbm \
-	themes/fieron2_data/stick.xbm
-
-eboxthemedir = $(themedir)/ebox_data
-dist_eboxtheme_DATA = \
-	themes/ebox_data/close.xbm \
-	themes/ebox_data/iconify.xbm \
-	themes/ebox_data/max.xbm
+clearlooks_themedir = $(themedir)/Clearlooks/openbox-3
+dist_clearlooks_theme_DATA= \
+	themes/Clearlooks/openbox-3/bullet.xbm \
+	themes/Clearlooks/openbox-3/close.xbm \
+	themes/Clearlooks/openbox-3/desk_toggled.xbm \
+	themes/Clearlooks/openbox-3/desk.xbm \
+	themes/Clearlooks/openbox-3/iconify.xbm \
+	themes/Clearlooks/openbox-3/max_toggled.xbm \
+	themes/Clearlooks/openbox-3/max.xbm \
+	themes/Clearlooks/openbox-3/themerc.xml
+
+clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3
+dist_clearlooksolive_theme_DATA= \
+	themes/Clearlooks-Olive/openbox-3/bullet.xbm \
+	themes/Clearlooks-Olive/openbox-3/close.xbm \
+	themes/Clearlooks-Olive/openbox-3/desk_toggled.xbm \
+	themes/Clearlooks-Olive/openbox-3/desk.xbm \
+	themes/Clearlooks-Olive/openbox-3/iconify.xbm \
+	themes/Clearlooks-Olive/openbox-3/max_toggled.xbm \
+	themes/Clearlooks-Olive/openbox-3/max.xbm \
+	themes/Clearlooks-Olive/openbox-3/themerc.xml
+
+mikachu_themedir = $(themedir)/Mikachu/openbox-3
+dist_mikachu_theme_DATA= \
+	themes/Mikachu/openbox-3/bullet.xbm \
+	themes/Mikachu/openbox-3/close.xbm \
+	themes/Mikachu/openbox-3/desk.xbm \
+	themes/Mikachu/openbox-3/iconify.xbm \
+	themes/Mikachu/openbox-3/max.xbm \
+	themes/Mikachu/openbox-3/themerc.xml
+
+
+natura_themedir = $(themedir)/Natura/openbox-3
+dist_natura_theme_DATA= \
+	themes/Natura/openbox-3/close_hover.xbm \
+	themes/Natura/openbox-3/close.xbm \
+	themes/Natura/openbox-3/desk_toggled.xbm \
+	themes/Natura/openbox-3/desk.xbm \
+	themes/Natura/openbox-3/iconify_disabled.xbm \
+	themes/Natura/openbox-3/iconify_hover.xbm \
+	themes/Natura/openbox-3/iconify.xbm \
+	themes/Natura/openbox-3/max_disabled.xbm \
+	themes/Natura/openbox-3/max_hover.xbm \
+	themes/Natura/openbox-3/max_toggled.xbm \
+	themes/Natura/openbox-3/max.xbm \
+	themes/Natura/openbox-3/shade.xbm \
+	themes/Natura/openbox-3/themerc.xml
+
+artwizboxed_themedir = $(themedir)/Artwiz-boxed/openbox-3
+dist_artwizboxed_theme_DATA= \
+	themes/Artwiz-boxed/openbox-3/close.xbm \
+	themes/Artwiz-boxed/openbox-3/desk_toggled.xbm \
+	themes/Artwiz-boxed/openbox-3/desk.xbm \
+	themes/Artwiz-boxed/openbox-3/iconify.xbm \
+	themes/Artwiz-boxed/openbox-3/max_toggled.xbm \
+	themes/Artwiz-boxed/openbox-3/max.xbm \
+	themes/Artwiz-boxed/openbox-3/themerc.xml
+
+bear2_themedir = $(themedir)/Bear2/openbox-3
+dist_bear2_theme_DATA= \
+	themes/Bear2/openbox-3/close_pressed.xbm \
+	themes/Bear2/openbox-3/close.xbm \
+	themes/Bear2/openbox-3/desk_toggled.xbm \
+	themes/Bear2/openbox-3/desk.xbm \
+	themes/Bear2/openbox-3/iconify_disabled.xbm \
+	themes/Bear2/openbox-3/iconify_pressed.xbm \
+	themes/Bear2/openbox-3/iconify.xbm \
+	themes/Bear2/openbox-3/max_disabled.xbm \
+	themes/Bear2/openbox-3/max_pressed.xbm \
+	themes/Bear2/openbox-3/max_toggled.xbm \
+	themes/Bear2/openbox-3/max.xbm \
+	themes/Bear2/openbox-3/shade_pressed.xbm \
+	themes/Bear2/openbox-3/shade.xbm \
+	themes/Bear2/openbox-3/themerc.xml
+
+orang_themedir = $(themedir)/Orang/openbox-3
+dist_orang_theme_DATA= \
+	themes/Orang/openbox-3/themerc.xml
+
+syscrash_themedir = $(themedir)/Syscrash/openbox-3
+dist_syscrash_theme_DATA= \
+	themes/Syscrash/openbox-3/bullet.xbm \
+	themes/Syscrash/openbox-3/close_disabled.xbm \
+	themes/Syscrash/openbox-3/close.xbm \
+	themes/Syscrash/openbox-3/desk_toggled.xbm \
+	themes/Syscrash/openbox-3/desk.xbm \
+	themes/Syscrash/openbox-3/iconify.xbm \
+	themes/Syscrash/openbox-3/max_disabled.xbm \
+	themes/Syscrash/openbox-3/max_pressed.xbm \
+	themes/Syscrash/openbox-3/max_toggled.xbm \
+	themes/Syscrash/openbox-3/max.xbm \
+	themes/Syscrash/openbox-3/shade.xbm \
+	themes/Syscrash/openbox-3/themerc.xml
+
+## public headers ##
+
+pubinclude_HEADERS = \
+	render/color.h \
+	render/font.h \
+	render/geom.h \
+	render/gradient.h \
+	render/image.h \
+	render/instance.h \
+	render/mask.h \
+	render/render.h \
+	render/theme.h \
+	parser/parse.h
+
+nodist_pubinclude_HEADERS = \
+	version.h
+
+nodist_pkgconfig_DATA = \
+	render/obrender-3.0.pc \
+	parser/obparser-3.0.pc
 
 ## data ##
 
-dist_rc_DATA = \
-	data/rc3
+dist_pixmap_DATA = \
+	data/openbox.png
+
+nodist_rc_DATA = \
+	data/rc.xml \
+	data/menu.xml
+
+dist_xsd_DATA = \
+	data/rc.xsd \
+	data/menu.xsd
+
+edit = $(SED) \
+	-e 's!@version\@!$(VERSION)!' \
+	-e 's!@xsddir\@!$(xsddir)!'
+
+data/rc.xml: Makefile $(srcdir)/data/rc.xml.in data
+	@echo make: creating $@
+	@rm -f $@
+	@mkdir data 2>/dev/null || true
+	@$(edit) $(srcdir)/data/rc.xml.in >$@
+
+data/menu.xml: Makefile $(srcdir)/data/menu.xml.in data
+	@echo make: creating $@
+	@rm -f $@
+	@mkdir data 2>/dev/null || true
+	@$(edit) $(srcdir)/data/menu.xml.in >$@
+
+dist_desktopfiles_DATA = \
+	data/openbox.desktop
+
+dist_noinst_DATA = \
+	version.h.in \
+	data/rc.xml.in \
+	data/menu.xml.in \
+	render/obrender-3.0.pc.in \
+	parser/obparser-3.0.pc.in \
+	tools/themeupdate/themeupdate.py \
+	tests/hideshow.py \
+	tests/Makefile \
+	tests/aspect.c \
+	tests/fullscreen.c \
+	tests/grav.c \
+	tests/grouptran.c \
+	tests/icons.c \
+	tests/modal2.c \
+	tests/modal3.c \
+	tests/modal.c \
+	tests/noresize.c \
+	tests/override.c \
+	tests/positioned.c \
+	tests/strut.c \
+	tests/title.c \
+	tests/urgent.c
 
 EXTRA_DIST = \
 	config.rpath \
 	mkinstalldirs \
+	CHANGELOG \
+	COMPLIANCE \
 	README \
 	COPYING \
-	AUTHORS \
-	plugins/obconf_interface.h
+	AUTHORS
+
+CLEANFILES = \
+	data/rc.xml \
+	data/menu.xml
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc