X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=0d688f1ab8c3ff5b1f857d4fe98c03d62c36ec47;hb=087ea0e5cb678d6a2339992c56f83482273fa7d6;hp=4b162ed471c8af8f2c3a91da04eecd368e0e6cf1;hpb=f7eb47dba4b091b67a28404ce461b15dffcb4298;p=chaz%2Fopenbox diff --git a/Makefile.am b/Makefile.am index 4b162ed4..0d688f1a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,17 @@ 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 +userscriptdir = $(datadir)/openbox -theme = thebear +theme = TheBear AUTOMAKE_OPTIONS = subdir-objects ACLOCAL_AMFLAGS = -I m4 @@ -22,21 +26,9 @@ lib_LTLIBRARIES = \ parser/libobparser.la bin_PROGRAMS = \ - kernel/openbox \ - tools/kdetrayproxy/kdetrayproxy - -plugin_LTLIBRARIES = \ - plugins/placement/placement.la \ - plugins/menu/client_menu.la \ - plugins/menu/client_list_menu.la -# plugins/menu/timed_menu.la \ -# plugins/menu/fifo_menu.la \ -# plugins/menu/include_menu.la \ - -if OBCONF -bin_PROGRAMS += \ - tools/obconf/obconf -endif + openbox/openbox \ + tools/kdetrayproxy/kdetrayproxy \ + tools/gnome-panel-control/gnome-panel-control ## render ## @@ -51,13 +43,16 @@ render_libobrender_la_CPPFLAGS = \ $(X_CFLAGS) \ $(XFT_CFLAGS) \ $(GLIB_CFLAGS) \ + $(XML_CFLAGS) \ -DG_LOG_DOMAIN=\"ObRender\" \ - -DDEFAULT_THEME=\"$(theme)\" \ - -DTHEMEDIR=\"$(themedir)\" + -DDEFAULT_THEME=\"$(theme)\" render_libobrender_la_LIBADD = \ $(X_LIBS) \ $(XFT_LIBS) \ - $(GLIB_LIBS) + $(GLIB_LIBS) \ + parser/libobparser.la +render_libobrender_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) render_libobrender_la_SOURCES = \ gettext.h \ render/color.h \ @@ -67,6 +62,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 \ @@ -85,29 +81,31 @@ parser_libobparser_la_CPPFLAGS = \ $(XML_CFLAGS) \ -DG_LOG_DOMAIN=\"ObParser\" \ -DLOCALEDIR=\"$(localedir)\" \ - -DRCDIR=\"$(rcdir)\" + -DDATADIR=\"$(datadir)\" \ + -DCONFIGDIR=\"$(configdir)\" parser_libobparser_la_LIBADD = \ $(GLIB_LIBS) \ $(XML_LIBS) +parser_libobparser_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) parser_libobparser_la_SOURCES = \ parser/parse.h \ parser/parse.c -## kernel ## +## openbox ## -kernel_openbox_CPPFLAGS = \ +openbox_openbox_CPPFLAGS = \ $(X_CFLAGS) \ $(SM_CFLAGS) \ $(XFT_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) \ @@ -115,193 +113,84 @@ kernel_openbox_LDADD = \ $(VIDMODE_LIBS) \ $(XSHAPE_LIBS) \ $(GLIB_LIBS) \ - $(GMODULE_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/keyboard.c \ - kernel/keyboard.h \ - kernel/keytree.c \ - kernel/keytree.h \ - kernel/menuframe.c \ - kernel/menuframe.h \ - kernel/menu.c \ - kernel/menu.h \ - kernel/misc.h \ - kernel/mouse.c \ - kernel/mouse.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/resist.c \ - kernel/resist.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/translate.c \ - kernel/translate.h \ - kernel/window.c \ - kernel/window.h \ - kernel/xerror.c \ - kernel/xerror.h \ - plugins/interface.h - -## 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/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) \ - $(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 - -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 = \ -o plugins/menu/client_list_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 \ - plugins/obconf_interface.h + openbox/action.c \ + openbox/action.h \ + openbox/client.c \ + openbox/client.h \ + openbox/client_list_menu.c \ + openbox/client_list_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/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 ## kdetrayproxy ## @@ -314,92 +203,100 @@ tools_kdetrayproxy_kdetrayproxy_SOURCES = \ tools/kdetrayproxy/kdetrayproxy.c +## gnome-panel-control ## + +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 ## -thebear_themedir = $(themedir)/thebear -dist_thebear_theme_DATA = \ - themes/thebear/themerc - -planton_themedir = $(themedir)/planton -dist_planton_theme_DATA = \ - themes/planton/themerc \ - themes/planton/max.xbm \ - themes/planton/max_toggled.xbm \ - themes/planton/desk.xbm \ - themes/planton/desk_toggled.xbm \ - themes/planton/shade.xbm \ - themes/planton/shade_toggled.xbm \ - themes/planton/iconify.xbm \ - themes/planton/close.xbm - -lightindustry_themedir = $(themedir)/Light-Industry -dist_lightindustry_theme_DATA = \ - themes/Light-Industry/themerc \ - themes/Light-Industry/max.xbm \ - themes/Light-Industry/iconify.xbm \ - themes/Light-Industry/close.xbm - -lightindustrybig_themedir = $(themedir)/Light-Industry-big -dist_lightindustrybig_theme_DATA = \ - themes/Light-Industry-big/themerc \ - themes/Light-Industry-big/max.xbm \ - themes/Light-Industry-big/iconify.xbm \ - themes/Light-Industry-big/close.xbm - -imerry_themedir = $(themedir)/I-merry -dist_imerry_theme_DATA = \ - themes/I-merry/themerc \ - themes/I-merry/max.xbm \ - themes/I-merry/iconify.xbm \ - themes/I-merry/close.xbm - -greenz_themedir = $(themedir)/greenz -dist_greenz_theme_DATA = \ - themes/greenz/themerc - -bbstyle_themedir = $(themedir)/BBstylE -dist_bbstyle_theme_DATA = \ - themes/BBstylE/themerc \ - themes/BBstylE/max.xbm \ - themes/BBstylE/max_toggled.xbm \ - themes/BBstylE/desk.xbm \ - themes/BBstylE/desk_toggled.xbm \ - themes/BBstylE/shade.xbm \ - themes/BBstylE/shade_toggled.xbm \ - themes/BBstylE/iconify.xbm \ - themes/BBstylE/close.xbm - -om4ob_themedir = $(themedir)/om4ob +allegro_themedir = $(themedir)/Allegro/openbox-3 +dist_allegro_theme_DATA = \ + themes/Allegro/openbox-3/themerc \ + themes/Allegro/openbox-3/bullet.xbm + +artwiz_themedir = $(themedir)/Artwiz/openbox-3 +dist_artwiz_theme_DATA = \ + themes/Artwiz/openbox-3/themerc + +blah41_themedir = $(themedir)/Blah41/openbox-3 +dist_blah41_theme_DATA = \ + themes/Blah41/openbox-3/themerc + +om4ob_themedir = $(themedir)/Om4Ob/openbox-3 dist_om4ob_theme_DATA = \ - themes/om4ob/themerc \ - themes/om4ob/close_hover.xbm \ - themes/om4ob/close.xbm \ - themes/om4ob/desk_hover.xbm \ - themes/om4ob/desk_toggled.xbm \ - themes/om4ob/desk.xbm \ - themes/om4ob/iconify_hover.xbm \ - themes/om4ob/iconify_pressed.xbm \ - themes/om4ob/iconify.xbm \ - themes/om4ob/max_disabled.xbm \ - themes/om4ob/max_hover.xbm \ - themes/om4ob/max_pressed.xbm \ - themes/om4ob/max_toggled.xbm \ - themes/om4ob/max.xbm \ - themes/om4ob/shade_disabled.xbm \ - themes/om4ob/shade_hover.xbm \ - themes/om4ob/shade_toggled.xbm \ - themes/om4ob/shade.xbm + themes/Om4Ob/openbox-3/themerc \ + themes/Om4Ob/openbox-3/close_hover.xbm \ + themes/Om4Ob/openbox-3/close.xbm \ + themes/Om4Ob/openbox-3/desk_hover.xbm \ + themes/Om4Ob/openbox-3/desk_toggled.xbm \ + themes/Om4Ob/openbox-3/desk.xbm \ + themes/Om4Ob/openbox-3/iconify_hover.xbm \ + themes/Om4Ob/openbox-3/iconify_pressed.xbm \ + themes/Om4Ob/openbox-3/iconify.xbm \ + themes/Om4Ob/openbox-3/max_disabled.xbm \ + themes/Om4Ob/openbox-3/max_hover.xbm \ + themes/Om4Ob/openbox-3/max_pressed.xbm \ + themes/Om4Ob/openbox-3/max_toggled.xbm \ + themes/Om4Ob/openbox-3/max.xbm \ + themes/Om4Ob/openbox-3/shade_disabled.xbm \ + themes/Om4Ob/openbox-3/shade_hover.xbm \ + themes/Om4Ob/openbox-3/shade_toggled.xbm \ + themes/Om4Ob/openbox-3/shade.xbm + +thebear_themedir = $(themedir)/TheBear/openbox-3 +dist_thebear_theme_DATA = \ + themes/TheBear/openbox-3/themerc + + +## public headers ## + +pubinclude_HEADERS = \ + render/render.h \ + render/theme.h \ + parser/parse.h +nodist_pkgconfig_DATA = \ + render/obrender-3.0.pc \ + parser/obparser-3.0.pc ## data ## -dist_rc_DATA = \ - data/rc3 \ - data/menu +dist_pixmap_DATA = \ + data/openbox.png + +nodist_rc_DATA = \ + data/rc.xml \ + data/menu.xml + +dist_xsd_DATA = \ + data/rc.xsd \ + data/menu.xsd + +%.xml: %.xml.in + @echo make: creating $@ + @$(SED) -e 's!@version@!$(VERSION)!' -e 's!@xsddir@!$(xsddir)!' $^ > $@ + +dist_userscript_DATA = \ + tools/themeupdate/themeupdate.py + +install-data-hook: + chmod +x $(DESTDIR)$(userscriptdir)/themeupdate.py dist_desktopfiles_DATA = \ data/openbox.desktop +dist_noinst_DATA = \ + data/rc.xml.in \ + data/menu.xml.in \ + render/obrender-3.0.pc.in \ + parser/obparser-3.0.pc.in + EXTRA_DIST = \ config.rpath \ mkinstalldirs \