X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=6a6f1754bc76e587c92bee60194c62981185f653;hb=ba1ac214dfdbc0539c922e84c2318c1bf2566c0c;hp=795c18bb27d298afc4da411f0677d896ce443696;hpb=ec4f685b82293120a47488bd6f7545caae27ea05;p=chaz%2Fopenbox diff --git a/Makefile.am b/Makefile.am index 795c18bb..6a6f1754 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,16 +1,19 @@ 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 +secretbindir = $(libdir)/openbox -theme = bear2 +theme = Clearlooks AUTOMAKE_OPTIONS = subdir-objects foreign @@ -27,15 +30,22 @@ lib_LTLIBRARIES = \ bin_PROGRAMS = \ openbox/openbox \ + tools/gdm-control/gdm-control \ tools/gnome-panel-control/gnome-panel-control -noinst_PROGRAMS = \ - tools/themetoxml/themetoxml +dist_secretbin_SCRIPTS = \ + tools/xdg-autostart/xdg-autostart + +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 +53,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 +63,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 +72,7 @@ render_libobrender_la_LIBADD = \ parser/libobparser.la \ $(X_LIBS) \ $(PANGO_LIBS) \ + $(XFT_LIBS) \ $(GLIB_LIBS) \ $(XML_LIBS) render_libobrender_la_SOURCES = \ @@ -74,6 +87,8 @@ render_libobrender_la_SOURCES = \ render/icon.h \ render/image.h \ render/image.c \ + render/imagecache.h \ + render/imagecache.c \ render/instance.h \ render/instance.c \ render/mask.h \ @@ -104,6 +119,12 @@ 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) \ @@ -121,6 +142,7 @@ openbox_openbox_LDADD = \ $(XKB_LIBS) \ $(XRANDR_LIBS) \ $(XSHAPE_LIBS) \ + $(XSYNC_LIBS) \ $(GLIB_LIBS) \ $(X_LIBS) \ $(XCURSOR_LIBS) \ @@ -133,8 +155,47 @@ 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/addremovedesktop.c \ + openbox/actions/breakchroot.c \ + openbox/actions/close.c \ + openbox/actions/cyclewindows.c \ + openbox/actions/debug.c \ + openbox/actions/decorations.c \ + openbox/actions/desktop.c \ + openbox/actions/dockautohide.c \ + openbox/actions/directionalwindows.c \ + openbox/actions/execute.c \ + openbox/actions/exit.c \ + openbox/actions/focus.c \ + openbox/actions/focustobottom.c \ + openbox/actions/fullscreen.c \ + openbox/actions/growtoedge.c \ + openbox/actions/iconify.c \ + openbox/actions/if.c \ + openbox/actions/kill.c \ + openbox/actions/layer.c \ + openbox/actions/session.c \ + openbox/actions/lower.c \ + openbox/actions/maximize.c \ + openbox/actions/move.c \ + openbox/actions/moverelative.c \ + openbox/actions/moveresizeto.c \ + openbox/actions/movetoedge.c \ + openbox/actions/omnipresent.c \ + openbox/actions/raise.c \ + openbox/actions/raiselower.c \ + openbox/actions/reconfigure.c \ + openbox/actions/resize.c \ + openbox/actions/resizerelative.c \ + openbox/actions/restart.c \ + openbox/actions/shade.c \ + openbox/actions/showdesktop.c \ + openbox/actions/showmenu.c \ + openbox/actions/unfocus.c \ + openbox/actions.c \ + openbox/actions.h \ openbox/client.c \ openbox/client.h \ openbox/client_list_menu.c \ @@ -155,6 +216,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 \ @@ -175,6 +242,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 \ @@ -182,8 +251,12 @@ openbox_openbox_SOURCES = \ openbox/mwm.h \ openbox/openbox.c \ openbox/openbox.h \ + openbox/ping.c \ + openbox/ping.h \ openbox/place.c \ openbox/place.h \ + openbox/prompt.c \ + openbox/prompt.h \ openbox/popup.c \ openbox/popup.h \ openbox/prop.c \ @@ -206,21 +279,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 = \ @@ -230,9 +288,45 @@ tools_gnome_panel_control_gnome_panel_control_LDADD = \ tools_gnome_panel_control_gnome_panel_control_SOURCES = \ tools/gnome-panel-control/gnome-panel-control.c +## gdm-control ## + +tools_gdm_control_gdm_control_CPPFLAGS = \ + $(X_CFLAGS) \ + $(GLIB_CFLAGS) +tools_gdm_control_gdm_control_LDADD = \ + $(X_LIBS) \ + $(GLIB_LIBS) +tools_gdm_control_gdm_control_SOURCES = \ + tools/gdm-control/gdm-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/themerc + +clearlooks34_themedir = $(themedir)/Clearlooks/openbox-3 +dist_clearlooks34_theme_DATA= \ + themes/Clearlooks-3.4/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 \ @@ -240,7 +334,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 @@ -248,63 +342,55 @@ 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 +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 + 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.xml - -orang_themedir = $(themedir)/orang/openbox-3 + 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.xml + themes/Orang/openbox-3/themerc + +onyx_themedir = $(themedir)/Onyx/openbox-3 +dist_onyx_theme_DATA= \ + themes/Onyx/openbox-3/themerc -syscrash_themedir = $(themedir)/syscrash/openbox-3 +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/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 ## @@ -333,36 +419,65 @@ dist_pixmap_DATA = \ data/openbox.png nodist_rc_DATA = \ + data/autostart.sh + +dist_rc_DATA = \ 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!@secretbindir\@!$(secretbindir)!' \ + -e 's!@bindir\@!$(bindir)!' + +data/autostart.sh: $(srcdir)/data/autostart.sh.in Makefile + @echo make: creating $@ + @$(edit) $< >$@ -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) $< >$@ + +%.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 -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/autostart.sh.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 \ @@ -383,18 +498,38 @@ 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 = \ + config.rpath + +# 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