X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=1d31a73bd3c0ec3b3f3d4c119a0c859d5e3d23b9;hb=6ff520d02ad3091c7e32a3cfc11fe8d3cb9b042f;hp=5d4637284fa69044fcacfcd863bafc00af4e06bb;hpb=d713bdf4623aa46676f95d1f38618b219ea5d9c9;p=chaz%2Fopenbox diff --git a/Makefile.am b/Makefile.am index 5d463728..1d31a73b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,13 +4,14 @@ 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 -theme = bear2 +theme = Clearlooks AUTOMAKE_OPTIONS = subdir-objects foreign @@ -29,6 +30,10 @@ bin_PROGRAMS = \ openbox/openbox \ tools/gnome-panel-control/gnome-panel-control +bin_SCRIPTS = \ + data/xsession/openbox-gnome-session \ + data/xsession/openbox-kde-session + noinst_PROGRAMS = \ tools/themetoxml/themetoxml @@ -104,6 +109,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 +132,7 @@ openbox_openbox_LDADD = \ $(XKB_LIBS) \ $(XRANDR_LIBS) \ $(XSHAPE_LIBS) \ + $(XSYNC_LIBS) \ $(GLIB_LIBS) \ $(X_LIBS) \ $(XCURSOR_LIBS) \ @@ -175,6 +187,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 \ @@ -188,6 +202,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 \ @@ -233,6 +249,28 @@ tools_gnome_panel_control_gnome_panel_control_SOURCES = \ ## 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 + +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 + mikachu_themedir = $(themedir)/Mikachu/openbox-3 dist_mikachu_theme_DATA= \ themes/Mikachu/openbox-3/bullet.xbm \ @@ -259,52 +297,51 @@ dist_natura_theme_DATA= \ themes/Natura/openbox-3/shade.xbm \ themes/Natura/openbox-3/themerc.xml -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/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 + 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 + themes/Orang/openbox-3/themerc.xml -syscrash_themedir = $(themedir)/syscrash/openbox-3 +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/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 ## @@ -332,40 +369,68 @@ nodist_pkgconfig_DATA = \ dist_pixmap_DATA = \ data/openbox.png -nodist_rc_DATA = \ +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!@bindir\@!$(bindir)!' -data/rc.xml: Makefile $(srcdir)/data/rc.xml.in data +data/xsession/openbox-gnome-session: Makefile data \ + $(srcdir)/data/xsession/openbox-gnome-session.in @echo make: creating $@ @rm -f $@ @mkdir data 2>/dev/null || true - @$(edit) $(srcdir)/data/rc.xml.in >$@ + @mkdir data/xsession 2>/dev/null || true + @$(edit) $(srcdir)/data/xsession/openbox-gnome-session.in >$@ + @chmod +x $@ -data/menu.xml: Makefile $(srcdir)/data/menu.xml.in data +data/xsession/openbox-kde-session: Makefile data \ + $(srcdir)/data/xsession/openbox-kde-session.in @echo make: creating $@ @rm -f $@ @mkdir data 2>/dev/null || true - @$(edit) $(srcdir)/data/menu.xml.in >$@ + @mkdir data/xsession 2>/dev/null || true + @$(edit) $(srcdir)/data/xsession/openbox-kde-session.in >$@ + @chmod +x $@ + +dist_gnomewmfiles_DATA = \ + data/gnome-wm-properties/openbox.desktop \ + data/gnome-wm-properties/openbox-gnome.desktop \ + data/gnome-wm-properties/openbox-kde.desktop -dist_desktopfiles_DATA = \ - data/openbox.desktop +dist_xsessions_DATA = \ + data/xsession/openbox.desktop \ + data/xsession/openbox-gnome.desktop \ + data/xsession/openbox-kde.desktop dist_noinst_DATA = \ - tools/themeupdate/themeupdate.py \ version.h.in \ - data/rc.xml.in \ - data/menu.xml.in \ + data/rc.xsd \ + data/menu.xsd \ + data/themerc.xsd \ + data/xsession/openbox-gnome-session.in \ + data/xsession/openbox-kde-session.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 \ @@ -376,10 +441,6 @@ EXTRA_DIST = \ COPYING \ AUTHORS -CLEANFILES = \ - data/rc.xml \ - data/menu.xml - #doc: # $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc