X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=2c2ba0207a7f7c32c46b7ba2e3c69854510a3b4d;hb=78af5d15e9dd94959786811e9eddfa1e5024067c;hp=8d554250bedb6bea5092fb9144f38c7fec2f255c;hpb=c81ffea4f9f545d8a0a3a3146712df4f967ae1b0;p=chaz%2Fopenbox diff --git a/Makefile.am b/Makefile.am index 8d554250..2c2ba020 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,7 @@ pixmapdir = $(datadir)/pixmaps xsddir = $(datadir)/openbox userscriptdir = $(datadir)/openbox -theme = TheBear +theme = bear2 AUTOMAKE_OPTIONS = subdir-objects foreign @@ -19,7 +19,7 @@ ACLOCAL_AMFLAGS = -I m4 INCLUDES = -I. -noinst_PROGRAMS = \ +check_PROGRAMS = \ render/rendertest lib_LTLIBRARIES = \ @@ -58,12 +58,12 @@ render_libobrender_la_CPPFLAGS = \ render_libobrender_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) render_libobrender_la_LIBADD = \ + parser/libobparser.la \ $(X_LIBS) \ $(XFT_LIBS) \ $(PANGO_LIBS) \ $(GLIB_LIBS) \ - $(PANGO_LIBS) \ - $(XML_LIBS) + $(XML_LIBS) render_libobrender_la_SOURCES = \ gettext.h \ render/color.h \ @@ -121,7 +121,6 @@ openbox_openbox_LDADD = \ $(XINERAMA_LIBS) \ $(XKB_LIBS) \ $(XRANDR_LIBS) \ - $(VIDMODE_LIBS) \ $(XSHAPE_LIBS) \ $(GLIB_LIBS) \ $(X_LIBS) \ @@ -131,8 +130,6 @@ openbox_openbox_LDADD = \ $(LIBINTL) \ render/libobrender.la \ parser/libobparser.la -# $(XFT_LIBS) \ -# $(PANGO_LIBS) \ openbox_openbox_LDFLAGS = -export-dynamic openbox_openbox_SOURCES = \ gettext.h \ @@ -141,7 +138,8 @@ openbox_openbox_SOURCES = \ 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 \ @@ -229,48 +227,89 @@ tools_gnome_panel_control_gnome_panel_control_SOURCES = \ ## themes ## -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/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 - +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 + + +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 + +artwizboxed_themedir = $(themedir)/artwiz-boxed/openbox-3 +dist_artwizboxed_theme_DATA= \ + themes/artwiz-boxed/openbox-3/bullet.xbm \ + 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 + +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 + +orang_themedir = $(themedir)/orang/openbox-3 +dist_orang_theme_DATA= \ + themes/orang/openbox-3/themerc + +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 ## 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