i know we broke backwards compatibility but noone uses it except obconf and it still...
[mikachu/openbox.git] / Makefile.am
index 98e436a..8fad996 100644 (file)
@@ -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,6 +31,11 @@ bin_PROGRAMS = \
        openbox/openbox \
        tools/gnome-panel-control/gnome-panel-control
 
+nodist_bin_SCRIPTS = \
+       data/xsession/openbox-session \
+       data/xsession/openbox-gnome-session \
+       data/xsession/openbox-kde-session
+
 noinst_PROGRAMS = \
        tools/themetoxml/themetoxml
 
@@ -36,6 +43,7 @@ noinst_PROGRAMS = \
 
 render_rendertest_CPPFLAGS = \
        $(PANGO_CFLAGS) \
+       $(XFT_CFLAGS) \
        $(GLIB_CFLAGS) \
        -DG_LOG_DOMAIN=\"RenderTest\"
 render_rendertest_LDADD = \
@@ -43,6 +51,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 +61,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 +70,7 @@ render_libobrender_la_LIBADD = \
        parser/libobparser.la \
        $(X_LIBS) \
        $(PANGO_LIBS) \
+       $(XFT_LIBS) \
        $(GLIB_LIBS) \
        $(XML_LIBS)
 render_libobrender_la_SOURCES = \
@@ -182,6 +193,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 +208,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 \
@@ -238,28 +253,27 @@ 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
 
 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
@@ -277,63 +291,47 @@ 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/shade_hover.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/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_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.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/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.xml
 
 ## public headers ##
 
@@ -361,37 +359,98 @@ 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/xsession/openbox-gnome.desktop: \
+               $(srcdir)/data/xsession/openbox-gnome.desktop.in
+       @echo make: creating $@
+       @mkdir data 2>/dev/null || true
+       @mkdir data/xsession 2>/dev/null || true
+       @$(edit) $< >$@
+
+data/xsession/openbox-kde.desktop: \
+               $(srcdir)/data/xsession/openbox-kde.desktop.in
+       @echo make: creating $@
+       @mkdir data 2>/dev/null || true
+       @mkdir data/xsession 2>/dev/null || true
+       @$(edit) $< >$@
+
+data/xsession/openbox.desktop: \
+               $(srcdir)/data/xsession/openbox.desktop.in
+       @echo make: creating $@
+       @mkdir data 2>/dev/null || true
+       @mkdir data/xsession 2>/dev/null || true
+       @$(edit) $< >$@
+
+data/xsession/openbox-gnome-session: \
+               $(srcdir)/data/xsession/openbox-gnome-session.in
+       @echo make: creating $@
+       @mkdir data 2>/dev/null || true
+       @mkdir data/xsession 2>/dev/null || true
+       @$(edit) $< >$@
+       @chmod a+x $@
 
-data/rc.xml: Makefile $(srcdir)/data/rc.xml.in data
+data/xsession/openbox-kde-session: \
+               $(srcdir)/data/xsession/openbox-kde-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) $< >$@
+       @chmod a+x $@
 
-data/menu.xml: Makefile $(srcdir)/data/menu.xml.in data
+data/xsession/openbox-session: \
+               $(srcdir)/data/xsession/openbox-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) $< >$@
+       @chmod a+x $@
+
+%.1.in: %.1.sgml
+       @echo make: creating $@
+       @mkdir doc 2>/dev/null || true
+       @docbook-to-man $< >$@
+
+%.1: %.1.in
+       @echo make: creating $@
+       @mkdir doc 2>/dev/null || true
+       @$(edit) $< >$@ 
 
-dist_desktopfiles_DATA = \
-       data/openbox.desktop
+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/themerc.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 \
@@ -412,18 +471,35 @@ 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 \
+       data/themerc.xsd \
+       doc/rc-mouse-focus.xml
 
-CLEANFILES = \
-       data/rc.xml \
-       data/menu.xml
+dist_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
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc