changes to build..
[mikachu/openbox.git] / Makefile.am
index fc415ba..3ae2b3d 100644 (file)
@@ -1,17 +1,18 @@
 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
-userscriptdir   = $(datadir)/openbox
 
-theme = bear2
+theme = Clearlooks
 
 AUTOMAKE_OPTIONS = subdir-objects foreign
 
@@ -28,13 +29,20 @@ lib_LTLIBRARIES = \
 
 bin_PROGRAMS = \
        openbox/openbox \
-       tools/kdetrayproxy/kdetrayproxy \
        tools/gnome-panel-control/gnome-panel-control
 
+bin_SCRIPTS = \
+       data/xsession/openbox-gnome-session \
+       data/xsession/openbox-kde-session
+
+noinst_PROGRAMS = \
+       tools/themetoxml/themetoxml
+
 ## render ##
 
 render_rendertest_CPPFLAGS = \
        $(PANGO_CFLAGS) \
+       $(XFT_CFLAGS) \
        $(GLIB_CFLAGS) \
        -DG_LOG_DOMAIN=\"RenderTest\"
 render_rendertest_LDADD = \
@@ -42,6 +50,7 @@ render_rendertest_LDADD = \
        render/libobrender.la \
        $(GLIB_LIBS) \
        $(PANGO_LIBS) \
+       $(XFT_LIBS) \
        $(XML_LIBS) \
        $(X_LIBS)
 render_rendertest_SOURCES = render/test.c
@@ -51,6 +60,7 @@ render_libobrender_la_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(XML_CFLAGS) \
        $(PANGO_CFLAGS) \
+       $(XFT_CFLAGS) \
        -DG_LOG_DOMAIN=\"ObRender\" \
        -DDEFAULT_THEME=\"$(theme)\"
 render_libobrender_la_LDFLAGS = \
@@ -59,6 +69,7 @@ render_libobrender_la_LIBADD = \
        parser/libobparser.la \
        $(X_LIBS) \
        $(PANGO_LIBS) \
+       $(XFT_LIBS) \
        $(GLIB_LIBS) \
        $(XML_LIBS)
 render_libobrender_la_SOURCES = \
@@ -103,7 +114,14 @@ 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) \
        $(PANGO_CFLAGS) \
        $(GLIB_CFLAGS) \
@@ -119,8 +137,10 @@ openbox_openbox_LDADD = \
        $(XKB_LIBS) \
        $(XRANDR_LIBS) \
        $(XSHAPE_LIBS) \
+       $(XSYNC_LIBS) \
        $(GLIB_LIBS) \
        $(X_LIBS) \
+       $(XCURSOR_LIBS) \
        $(LIBSN_LIBS) \
        $(XML_LIBS) \
        $(EFENCE_LIBS) \
@@ -135,6 +155,7 @@ openbox_openbox_SOURCES = \
        openbox/client.c \
        openbox/client.h \
        openbox/client_list_menu.c \
+       openbox/client_list_menu.h \
        openbox/client_list_combined_menu.c \
        openbox/client_list_combined_menu.h \
        openbox/client_menu.c \
@@ -171,6 +192,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 \
@@ -184,6 +207,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 \
@@ -202,14 +227,19 @@ openbox_openbox_SOURCES = \
        openbox/xerror.h
 
 
-## kdetrayproxy ##
+## themetoxml ##
 
-tools_kdetrayproxy_kdetrayproxy_CPPFLAGS = \
-       $(X_CFLAGS)
-tools_kdetrayproxy_kdetrayproxy_LDADD = \
-       $(X_LIBS)
-tools_kdetrayproxy_kdetrayproxy_SOURCES = \
-       tools/kdetrayproxy/kdetrayproxy.c
+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 ##
@@ -222,8 +252,29 @@ 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/themerc.xml
+
+clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3
+dist_clearlooksolive_theme_DATA= \
+       themes/Clearlooks-Olive/openbox-3/themerc.xml
+
 mikachu_themedir = $(themedir)/Mikachu/openbox-3
 dist_mikachu_theme_DATA= \
        themes/Mikachu/openbox-3/bullet.xbm \
@@ -231,7 +282,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
+       themes/Mikachu/openbox-3/themerc.xml
 
 
 natura_themedir = $(themedir)/Natura/openbox-3
@@ -239,63 +290,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/themerc
+       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
-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
-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
+       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
+       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 ##
 
@@ -323,58 +358,83 @@ 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 >$@
-
-dist_userscript_DATA = \
-       tools/themeupdate/themeupdate.py
+       @mkdir data/xsession 2>/dev/null || true
+       @$(edit) $(srcdir)/data/xsession/openbox-kde-session.in >$@
+       @chmod +x $@
 
-install-data-hook:
-       chmod +x $(DESTDIR)$(userscriptdir)/themeupdate.py
+dist_gnomewmfiles_DATA = \
+       data/gnome-wm-properties/openbox.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 = \
+       debian/changelog.in \
+       debian/compat \
+       debian/control \
+       debian/copyright \
+       debian/menu \
+       debian/postinst \
+       debian/postrm \
+       debian/rules \
        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
+
+dist_doc_DATA = \
+       COMPLIANCE \
+       README \
+       AUTHORS
 
 EXTRA_DIST = \
        config.rpath \
        mkinstalldirs \
        CHANGELOG \
-       COMPLIANCE \
-       README \
-       COPYING \
-       AUTHORS
-
-CLEANFILES = \
-       data/rc.xml \
-       data/menu.xml
+       COPYING
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc