X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=2eac7313fa70147bfe33037ad7867c07e396684a;hb=5d5be2ba2a6e0b3886e0076475ed9d7a2d4ac9ab;hp=dcfaccd9b7ea0bf0c406f49643e3099acd29e7a1;hpb=e0aa54a8912e34e94d42872dba95ade0fda7fdca;p=chaz%2Fopenbox diff --git a/Makefile.am b/Makefile.am index dcfaccd9..2eac7313 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,9 +9,8 @@ pkgconfigdir = $(libdir)/pkgconfig pubincludedir = $(includedir)/openbox/@OB_VERSION@/openbox pixmapdir = $(datadir)/pixmaps xsddir = $(datadir)/openbox -userscriptdir = $(datadir)/openbox -theme = TheBear +theme = bear2 AUTOMAKE_OPTIONS = subdir-objects foreign @@ -19,7 +18,7 @@ ACLOCAL_AMFLAGS = -I m4 INCLUDES = -I. -noinst_PROGRAMS = \ +check_PROGRAMS = \ render/rendertest lib_LTLIBRARIES = \ @@ -28,19 +27,20 @@ lib_LTLIBRARIES = \ bin_PROGRAMS = \ openbox/openbox \ - tools/kdetrayproxy/kdetrayproxy \ 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 = \ parser/libobparser.la \ render/libobrender.la \ - $(XFT_LIBS) \ $(GLIB_LIBS) \ $(PANGO_LIBS) \ $(XML_LIBS) \ @@ -49,7 +49,6 @@ render_rendertest_SOURCES = render/test.c render_libobrender_la_CPPFLAGS = \ $(X_CFLAGS) \ - $(XFT_CFLAGS) \ $(GLIB_CFLAGS) \ $(XML_CFLAGS) \ $(PANGO_CFLAGS) \ @@ -60,7 +59,6 @@ render_libobrender_la_LDFLAGS = \ render_libobrender_la_LIBADD = \ parser/libobparser.la \ $(X_LIBS) \ - $(XFT_LIBS) \ $(PANGO_LIBS) \ $(GLIB_LIBS) \ $(XML_LIBS) @@ -106,9 +104,16 @@ parser_libobparser_la_SOURCES = \ ## openbox ## 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) \ $(LIBSN_CFLAGS) \ $(XML_CFLAGS) \ @@ -122,8 +127,10 @@ openbox_openbox_LDADD = \ $(XKB_LIBS) \ $(XRANDR_LIBS) \ $(XSHAPE_LIBS) \ + $(XSYNC_LIBS) \ $(GLIB_LIBS) \ $(X_LIBS) \ + $(XCURSOR_LIBS) \ $(LIBSN_LIBS) \ $(XML_LIBS) \ $(EFENCE_LIBS) \ @@ -139,6 +146,8 @@ openbox_openbox_SOURCES = \ 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 \ @@ -204,14 +213,19 @@ openbox_openbox_SOURCES = \ openbox/xerror.h -## kdetrayproxy ## +## themetoxml ## -tools_kdetrayproxy_kdetrayproxy_CPPFLAGS = \ - $(X_CFLAGS) -tools_kdetrayproxy_kdetrayproxy_LDADD = \ - $(X_LIBS) -tools_kdetrayproxy_kdetrayproxy_SOURCES = \ - tools/kdetrayproxy/kdetrayproxy.c +tools_themetoxml_themetoxml_CPPFLAGS = \ + $(X_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(XML_CFLAGS) +tools_themetoxml_themetoxml_LDADD = \ + $(X_LIBS) \ + $(GLIB_LIBS) \ + $(XML_LIBS) +tools_themetoxml_themetoxml_SOURCES = \ + tools/themetoxml/themetoxml.c \ + tools/themetoxml/rgb.h ## gnome-panel-control ## @@ -226,48 +240,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.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/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.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 @@ -308,12 +363,6 @@ data/menu.xml: Makefile $(srcdir)/data/menu.xml.in data @mkdir data 2>/dev/null || true @$(edit) $(srcdir)/data/menu.xml.in >$@ -dist_userscript_DATA = \ - tools/themeupdate/themeupdate.py - -install-data-hook: - chmod +x $(DESTDIR)$(userscriptdir)/themeupdate.py - dist_desktopfiles_DATA = \ data/openbox.desktop @@ -322,7 +371,24 @@ dist_noinst_DATA = \ data/rc.xml.in \ data/menu.xml.in \ render/obrender-3.0.pc.in \ - parser/obparser-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 \