X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=baa62b3339aa029f7f67444b692edf81333f7bb4;hb=96bb892054bb9801fd2b5b7959ee2cec27c075ea;hp=5a42da0eab6fe5999336f40566d027d16875daf4;hpb=68652bb5aa037f47080499a6f9eba2684dbe1e32;p=chaz%2Fopenbox diff --git a/Makefile.am b/Makefile.am index 5a42da0e..baa62b33 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,17 +1,18 @@ SUBDIRS = m4 po +docxbmdir = $(docdir)/xbm themedir = $(datadir)/themes localedir = $(datadir)/locale configdir = $(sysconfdir)/xdg rcdir = $(configdir)/openbox -desktopfilesdir = $(datadir)/gnome/wm-properties +xsessionsdir = $(datadir)/xsessions +gnomewmfilesdir = $(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 = Clearlooks AUTOMAKE_OPTIONS = subdir-objects foreign @@ -19,7 +20,7 @@ ACLOCAL_AMFLAGS = -I m4 INCLUDES = -I. -noinst_PROGRAMS = \ +check_PROGRAMS = \ render/rendertest lib_LTLIBRARIES = \ @@ -28,40 +29,47 @@ lib_LTLIBRARIES = \ bin_PROGRAMS = \ openbox/openbox \ - tools/kdetrayproxy/kdetrayproxy \ tools/gnome-panel-control/gnome-panel-control +nodist_bin_SCRIPTS = \ + data/xsession/openbox-session \ + data/xsession/openbox-gnome-session \ + data/xsession/openbox-kde-session + ## render ## render_rendertest_CPPFLAGS = \ + $(PANGO_CFLAGS) \ $(XFT_CFLAGS) \ $(GLIB_CFLAGS) \ -DG_LOG_DOMAIN=\"RenderTest\" render_rendertest_LDADD = \ parser/libobparser.la \ render/libobrender.la \ - $(XFT_LIBS) \ $(GLIB_LIBS) \ $(PANGO_LIBS) \ + $(XFT_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) \ + $(XFT_CFLAGS) \ -DG_LOG_DOMAIN=\"ObRender\" \ -DDEFAULT_THEME=\"$(theme)\" render_libobrender_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) render_libobrender_la_LIBADD = \ + parser/libobparser.la \ $(X_LIBS) \ + $(PANGO_LIBS) \ $(XFT_LIBS) \ $(GLIB_LIBS) \ - $(XML_LIBS) + $(XML_LIBS) render_libobrender_la_SOURCES = \ gettext.h \ render/color.h \ @@ -94,7 +102,7 @@ parser_libobparser_la_CPPFLAGS = \ -DCONFIGDIR=\"$(configdir)\" parser_libobparser_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -render_libobparser_la_LIBADD = \ +parser_libobparser_la_LIBADD = \ $(GLIB_LIBS) \ $(XML_LIBS) parser_libobparser_la_SOURCES = \ @@ -104,9 +112,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) \ @@ -116,15 +131,14 @@ openbox_openbox_CPPFLAGS = \ -DG_LOG_DOMAIN=\"Openbox\" openbox_openbox_LDADD = \ $(SM_LIBS) \ - $(XFT_LIBS) \ $(XINERAMA_LIBS) \ $(XKB_LIBS) \ $(XRANDR_LIBS) \ - $(VIDMODE_LIBS) \ $(XSHAPE_LIBS) \ + $(XSYNC_LIBS) \ $(GLIB_LIBS) \ - $(PANGO_LIBS) \ $(X_LIBS) \ + $(XCURSOR_LIBS) \ $(LIBSN_LIBS) \ $(XML_LIBS) \ $(EFENCE_LIBS) \ @@ -140,6 +154,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 \ @@ -154,6 +170,12 @@ openbox_openbox_SOURCES = \ openbox/extensions.h \ openbox/focus.c \ openbox/focus.h \ + openbox/focus_cycle.c \ + openbox/focus_cycle.h \ + openbox/focus_cycle_indicator.c \ + openbox/focus_cycle_indicator.h \ + openbox/focus_cycle_popup.c \ + openbox/focus_cycle_popup.h \ openbox/frame.c \ openbox/frame.h \ openbox/framerender.c \ @@ -174,6 +196,8 @@ openbox_openbox_SOURCES = \ openbox/menu.c \ openbox/menu.h \ openbox/misc.h \ + openbox/modkeys.c \ + openbox/modkeys.h \ openbox/mouse.c \ openbox/mouse.h \ openbox/moveresize.c \ @@ -187,6 +211,8 @@ openbox_openbox_SOURCES = \ openbox/popup.h \ openbox/prop.c \ openbox/prop.h \ + openbox/propwin.c \ + openbox/propwin.h \ openbox/resist.c \ openbox/resist.h \ openbox/screen.c \ @@ -205,16 +231,6 @@ openbox_openbox_SOURCES = \ openbox/xerror.h -## kdetrayproxy ## - -tools_kdetrayproxy_kdetrayproxy_CPPFLAGS = \ - $(X_CFLAGS) -tools_kdetrayproxy_kdetrayproxy_LDADD = \ - $(X_LIBS) -tools_kdetrayproxy_kdetrayproxy_SOURCES = \ - tools/kdetrayproxy/kdetrayproxy.c - - ## gnome-panel-control ## tools_gnome_panel_control_gnome_panel_control_CPPFLAGS = \ @@ -225,50 +241,96 @@ tools_gnome_panel_control_gnome_panel_control_SOURCES = \ tools/gnome-panel-control/gnome-panel-control.c -## themes ## +## default button masks ## +dist_docxbm_DATA = \ + data/xbm/bullet.xbm \ + data/xbm/close.xbm \ + data/xbm/desk_toggled.xbm \ + data/xbm/desk.xbm \ + data/xbm/iconify.xbm \ + data/xbm/max_toggled.xbm \ + data/xbm/max.xbm \ + data/xbm/shade_toggled.xbm \ + data/xbm/shade.xbm + -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 +## themes ## +clearlooks_themedir = $(themedir)/Clearlooks/openbox-3 +dist_clearlooks_theme_DATA= \ + themes/Clearlooks/openbox-3/themerc + +clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3 +dist_clearlooksolive_theme_DATA= \ + themes/Clearlooks-Olive/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_hover.xbm \ + themes/Natura/openbox-3/desk.xbm \ + themes/Natura/openbox-3/iconify_hover.xbm \ + themes/Natura/openbox-3/iconify.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/shade_hover.xbm \ + themes/Natura/openbox-3/themerc + +artwizboxed_themedir = $(themedir)/Artwiz-boxed/openbox-3 +dist_artwizboxed_theme_DATA= \ + 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_pressed.xbm \ + themes/Bear2/openbox-3/iconify.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/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/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 @@ -285,58 +347,120 @@ nodist_pkgconfig_DATA = \ dist_pixmap_DATA = \ data/openbox.png -nodist_rc_DATA = \ +dist_rc_DATA = \ + data/autostart.sh \ 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)!' + -e 's!@configdir\@!$(configdir)!' \ + -e 's!@bindir\@!$(bindir)!' + +%.desktop: %.desktop.in Makefile + @echo make: creating $@ + @$(edit) $< >$@ -data/rc.xml: Makefile $(srcdir)/data/rc.xml.in data +%-session: %-session.in Makefile @echo make: creating $@ - @rm -f $@ - @mkdir data 2>/dev/null || true - @$(edit) $(srcdir)/data/rc.xml.in >$@ + @$(edit) $< >$@ -data/menu.xml: Makefile $(srcdir)/data/menu.xml.in data +%.1.in: %.1.sgml @echo make: creating $@ - @rm -f $@ - @mkdir data 2>/dev/null || true - @$(edit) $(srcdir)/data/menu.xml.in >$@ + @docbook-to-man $< >$@ -dist_userscript_DATA = \ - tools/themeupdate/themeupdate.py +%.1: %.1.in Makefile + @echo make: creating $@ + @$(edit) $< >$@ -install-data-hook: - chmod +x $(DESTDIR)$(userscriptdir)/themeupdate.py +dist_gnomewmfiles_DATA = \ + data/gnome-wm-properties/openbox.desktop -dist_desktopfiles_DATA = \ - data/openbox.desktop +nodist_xsessions_DATA = \ + data/xsession/openbox.desktop \ + data/xsession/openbox-gnome.desktop \ + data/xsession/openbox-kde.desktop dist_noinst_DATA = \ version.h.in \ - data/rc.xml.in \ - data/menu.xml.in \ + data/rc.xsd \ + data/menu.xsd \ + data/xsession/openbox.desktop.in \ + data/xsession/openbox-gnome.desktop.in \ + data/xsession/openbox-kde.desktop.in \ + data/xsession/openbox-session.in \ + data/xsession/openbox-gnome-session.in \ + data/xsession/openbox-kde-session.in \ + doc/openbox.1.sgml \ + doc/openbox.1.in \ + doc/openbox-session.1.sgml \ + doc/openbox-session.1.in \ + doc/openbox-gnome-session.1.sgml \ + doc/openbox-gnome-session.1.in \ + doc/openbox-kde-session.1.sgml \ + doc/openbox-kde-session.1.in \ render/obrender-3.0.pc.in \ - parser/obparser-3.0.pc.in - -EXTRA_DIST = \ - config.rpath \ - mkinstalldirs \ - CHANGELOG \ + 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 + +dist_doc_DATA = \ COMPLIANCE \ README \ + AUTHORS \ + CHANGELOG \ COPYING \ - AUTHORS + data/rc.xsd \ + data/menu.xsd \ + doc/rc-mouse-focus.xml + +nodist_man_MANS = \ + doc/openbox.1 \ + doc/openbox-session.1 \ + doc/openbox-gnome-session.1 \ + doc/openbox-kde-session.1 +EXTRA_DIST = \ + debian/changelog.in \ + debian/compat \ + debian/conffiles \ + debian/control \ + debian/copyright \ + debian/menu \ + debian/postinst \ + debian/postrm \ + debian/rules \ + config.rpath \ + mkinstalldirs + +# make clean doesn't delete these for some reason, even though they are +# built by make CLEANFILES = \ - data/rc.xml \ - data/menu.xml + doc/openbox.1 \ + doc/openbox-session.1 \ + doc/openbox-gnome-session.1 \ + doc/openbox-kde-session.1 \ + data/xsession/openbox-session \ + data/xsession/openbox-gnome-session \ + data/xsession/openbox-kde-session \ + data/xsession/openbox.desktop \ + data/xsession/openbox-gnome.desktop \ + data/xsession/openbox-kde.desktop #doc: # $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc