X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=c733558832a830ff7ec4760156111180cb7851e0;hb=9dacac5e5e6b9ed86e76680b048bc227d8866ac6;hp=9bef49a53b342360385a0185704dfe09ede185a6;hpb=7e946f68d9f8ec7c880664b437edbbaa5d49ac10;p=chaz%2Fopenbox diff --git a/Makefile.am b/Makefile.am index 9bef49a5..c7335588 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,12 @@ 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 @@ -29,13 +31,16 @@ bin_PROGRAMS = \ openbox/openbox \ tools/gnome-panel-control/gnome-panel-control -noinst_PROGRAMS = \ - tools/themetoxml/themetoxml +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 = \ @@ -43,6 +48,7 @@ render_rendertest_LDADD = \ render/libobrender.la \ $(GLIB_LIBS) \ $(PANGO_LIBS) \ + $(XFT_LIBS) \ $(XML_LIBS) \ $(X_LIBS) render_rendertest_SOURCES = render/test.c @@ -52,6 +58,7 @@ render_libobrender_la_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(XML_CFLAGS) \ $(PANGO_CFLAGS) \ + $(XFT_CFLAGS) \ -DG_LOG_DOMAIN=\"ObRender\" \ -DDEFAULT_THEME=\"$(theme)\" render_libobrender_la_LDFLAGS = \ @@ -60,6 +67,7 @@ render_libobrender_la_LIBADD = \ parser/libobparser.la \ $(X_LIBS) \ $(PANGO_LIBS) \ + $(XFT_LIBS) \ $(GLIB_LIBS) \ $(XML_LIBS) render_libobrender_la_SOURCES = \ @@ -110,6 +118,9 @@ openbox_openbox_CPPFLAGS = \ $(XRANDR_CFLAGS) \ $(XSHAPE_CFLAGS) \ $(XSYNC_CFLAGS) \ + $(XRENDER_CFLAGS) \ + $(XDAMAGE_CFLAGS) \ + $(XCOMPOSITE_CFLAGS) \ $(X_CFLAGS) \ $(XCURSOR_CFLAGS) \ $(SM_CFLAGS) \ @@ -129,6 +140,9 @@ openbox_openbox_LDADD = \ $(XSHAPE_LIBS) \ $(XSYNC_LIBS) \ $(GLIB_LIBS) \ + $(XRENDER_LIBS) \ + $(XDAMAGE_LIBS) \ + $(XCOMPOSITE_LIBS) \ $(X_LIBS) \ $(XCURSOR_LIBS) \ $(LIBSN_LIBS) \ @@ -140,8 +154,12 @@ openbox_openbox_LDADD = \ openbox_openbox_LDFLAGS = -export-dynamic openbox_openbox_SOURCES = \ gettext.h \ - openbox/action.c \ - openbox/action.h \ + openbox/actions/all.c \ + openbox/actions/all.h \ + openbox/actions/debug.c \ + openbox/actions/execute.c \ + openbox/actions.c \ + openbox/actions.h \ openbox/client.c \ openbox/client.h \ openbox/client_list_menu.c \ @@ -150,6 +168,8 @@ openbox_openbox_SOURCES = \ openbox/client_list_combined_menu.h \ openbox/client_menu.c \ openbox/client_menu.h \ + openbox/composite.c \ + openbox/composite.h \ openbox/config.c \ openbox/config.h \ openbox/debug.c \ @@ -162,6 +182,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 \ @@ -197,6 +223,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 \ @@ -215,21 +243,6 @@ openbox_openbox_SOURCES = \ openbox/xerror.h -## themetoxml ## - -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 ## tools_gnome_panel_control_gnome_panel_control_CPPFLAGS = \ @@ -240,29 +253,28 @@ tools_gnome_panel_control_gnome_panel_control_SOURCES = \ tools/gnome-panel-control/gnome-panel-control.c +## 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 + + ## themes ## 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 + themes/Clearlooks/openbox-3/themerc 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 + themes/Clearlooks-Olive/openbox-3/themerc mikachu_themedir = $(themedir)/Mikachu/openbox-3 dist_mikachu_theme_DATA= \ @@ -271,7 +283,7 @@ dist_mikachu_theme_DATA= \ themes/Mikachu/openbox-3/desk.xbm \ themes/Mikachu/openbox-3/iconify.xbm \ themes/Mikachu/openbox-3/max.xbm \ - themes/Mikachu/openbox-3/themerc.xml + themes/Mikachu/openbox-3/themerc natura_themedir = $(themedir)/Natura/openbox-3 @@ -279,27 +291,20 @@ 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_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 + 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/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 + themes/Artwiz-boxed/openbox-3/themerc bear2_themedir = $(themedir)/Bear2/openbox-3 dist_bear2_theme_DATA= \ @@ -307,35 +312,34 @@ dist_bear2_theme_DATA= \ 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 + themes/Bear2/openbox-3/themerc orang_themedir = $(themedir)/Orang/openbox-3 dist_orang_theme_DATA= \ - themes/Orang/openbox-3/themerc.xml + themes/Orang/openbox-3/themerc + +onyx_themedir = $(themedir)/Onyx/openbox-3 +dist_onyx_theme_DATA= \ + themes/Onyx/openbox-3/themerc + +onyxcitrus_themedir = $(themedir)/Onyx-Citrus/openbox-3 +dist_onyxcitrus_theme_DATA= \ + themes/Onyx-Citrus/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.xml + themes/Syscrash/openbox-3/themerc ## public headers ## @@ -363,37 +367,58 @@ 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)!' -data/rc.xml: Makefile $(srcdir)/data/rc.xml.in data +%.desktop: %.desktop.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 +%-session: %-session.in Makefile @echo make: creating $@ - @rm -f $@ - @mkdir data 2>/dev/null || true - @$(edit) $(srcdir)/data/menu.xml.in >$@ + @$(edit) $< >$@ -dist_desktopfiles_DATA = \ - data/openbox.desktop +%.1.in: %.1.sgml + @echo make: creating $@ + @docbook-to-man $< >$@ + +%.1: %.1.in Makefile + @echo make: creating $@ + @$(edit) $< >$@ + +dist_gnomewmfiles_DATA = \ + data/gnome-wm-properties/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 \ tools/themeupdate/themeupdate.py \ @@ -414,18 +439,48 @@ dist_noinst_DATA = \ tests/title.c \ tests/urgent.c -EXTRA_DIST = \ - config.rpath \ - mkinstalldirs \ - CHANGELOG \ +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