always set the multipliers just dont allow 0

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b879c0178e76722a8ccef8d9b10ee93d8ee604da..1d31a73bd3c0ec3b3f3d4c119a0c859d5e3d23b9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,8 @@ 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,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
 
@@ -197,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 \
@@ -362,37 +369,49 @@ 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 = \
        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 \
        tools/themeupdate/themeupdate.py \
@@ -422,10 +441,6 @@ EXTRA_DIST = \
        COPYING \
        AUTHORS
 
-CLEANFILES = \
-       data/rc.xml \
-       data/menu.xml
-
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc