possible buffer overflow?

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2eac7313fa70147bfe33037ad7867c07e396684a..35ccca9c577d693596ef1d0c088345e5ed49702f 100644 (file)
--- 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,12 @@ bin_PROGRAMS = \
        openbox/openbox \
        tools/gnome-panel-control/gnome-panel-control
 
+bin_SCRIPTS = \
+       data/xsession/openbox-gnome-session \
+       data/xsession/openbox-kde-session \
+       data/xsession/openbox-gnome \
+       data/xsession/openbox-kde
+
 noinst_PROGRAMS = \
        tools/themetoxml/themetoxml
 
@@ -182,6 +189,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 \
@@ -195,6 +204,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 \
@@ -240,6 +251,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 \
@@ -266,52 +299,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 ##
 
@@ -343,10 +375,6 @@ nodist_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)!'
@@ -363,11 +391,21 @@ data/menu.xml: Makefile $(srcdir)/data/menu.xml.in data
        @mkdir data 2>/dev/null || true
        @$(edit) $(srcdir)/data/menu.xml.in >$@
 
-dist_desktopfiles_DATA = \
-       data/openbox.desktop
+dist_gnomewmfiles_DATA = \
+       data/gnome-wm-properties/openbox.desktop \
+       data/gnome-wm-properties/openbox-gnome.desktop \
+       data/gnome-wm-properties/openbox-kde.desktop
+
+dist_xsessions_DATA = \
+       data/xsession/openbox.desktop \
+       data/xsession/openbox-gnome.desktop \
+       data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
        version.h.in \
+       data/rc.xsd \
+       data/menu.xsd \
+       data/themerc.xsd \
        data/rc.xml.in \
        data/menu.xml.in \
        render/obrender-3.0.pc.in \