add a RECONFIGURING state, and enter that when doing reconfiguring
[mikachu/openbox.git] / Makefile.am
index 16fef2b..6a6f175 100644 (file)
@@ -11,6 +11,7 @@ pkgconfigdir    = $(libdir)/pkgconfig
 pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
+secretbindir    = $(libdir)/openbox
 
 theme = Clearlooks
 
@@ -29,16 +30,17 @@ lib_LTLIBRARIES = \
 
 bin_PROGRAMS = \
        openbox/openbox \
+       tools/gdm-control/gdm-control \
        tools/gnome-panel-control/gnome-panel-control
 
+dist_secretbin_SCRIPTS = \
+       tools/xdg-autostart/xdg-autostart
+
 nodist_bin_SCRIPTS = \
        data/xsession/openbox-session \
        data/xsession/openbox-gnome-session \
        data/xsession/openbox-kde-session
 
-noinst_PROGRAMS = \
-       tools/themetoxml/themetoxml
-
 ## render ##
 
 render_rendertest_CPPFLAGS = \
@@ -85,6 +87,8 @@ render_libobrender_la_SOURCES = \
        render/icon.h \
        render/image.h \
        render/image.c \
+       render/imagecache.h \
+       render/imagecache.c \
        render/instance.h \
        render/instance.c \
        render/mask.h \
@@ -151,8 +155,47 @@ openbox_openbox_LDADD = \
 openbox_openbox_LDFLAGS = -export-dynamic
 openbox_openbox_SOURCES = \
        gettext.h \
-       openbox/action.c \
-       openbox/action.h \
+       openbox/actions/all.c \
+       openbox/actions/all.h \
+       openbox/actions/addremovedesktop.c \
+       openbox/actions/breakchroot.c \
+       openbox/actions/close.c \
+       openbox/actions/cyclewindows.c \
+       openbox/actions/debug.c \
+       openbox/actions/decorations.c \
+       openbox/actions/desktop.c \
+       openbox/actions/dockautohide.c \
+       openbox/actions/directionalwindows.c \
+       openbox/actions/execute.c \
+       openbox/actions/exit.c \
+       openbox/actions/focus.c \
+       openbox/actions/focustobottom.c \
+       openbox/actions/fullscreen.c \
+       openbox/actions/growtoedge.c \
+       openbox/actions/iconify.c \
+       openbox/actions/if.c \
+       openbox/actions/kill.c \
+       openbox/actions/layer.c \
+       openbox/actions/session.c \
+       openbox/actions/lower.c \
+       openbox/actions/maximize.c \
+       openbox/actions/move.c \
+       openbox/actions/moverelative.c \
+       openbox/actions/moveresizeto.c \
+       openbox/actions/movetoedge.c \
+       openbox/actions/omnipresent.c \
+       openbox/actions/raise.c \
+       openbox/actions/raiselower.c \
+       openbox/actions/reconfigure.c \
+       openbox/actions/resize.c \
+       openbox/actions/resizerelative.c \
+       openbox/actions/restart.c \
+       openbox/actions/shade.c \
+       openbox/actions/showdesktop.c \
+       openbox/actions/showmenu.c \
+       openbox/actions/unfocus.c \
+       openbox/actions.c \
+       openbox/actions.h \
        openbox/client.c \
        openbox/client.h \
        openbox/client_list_menu.c \
@@ -173,6 +216,12 @@ openbox_openbox_SOURCES = \
        openbox/extensions.h \
        openbox/focus.c \
        openbox/focus.h \
+       openbox/focus_cycle.c \
+       openbox/focus_cycle.h \
+       openbox/focus_cycle_indicator.c \
+       openbox/focus_cycle_indicator.h \
+       openbox/focus_cycle_popup.c \
+       openbox/focus_cycle_popup.h \
        openbox/frame.c \
        openbox/frame.h \
        openbox/framerender.c \
@@ -202,14 +251,16 @@ openbox_openbox_SOURCES = \
        openbox/mwm.h \
        openbox/openbox.c \
        openbox/openbox.h \
+       openbox/ping.c \
+       openbox/ping.h \
        openbox/place.c \
        openbox/place.h \
+       openbox/prompt.c \
+       openbox/prompt.h \
        openbox/popup.c \
        openbox/popup.h \
        openbox/prop.c \
        openbox/prop.h \
-       openbox/propwin.c \
-       openbox/propwin.h \
        openbox/resist.c \
        openbox/resist.h \
        openbox/screen.c \
@@ -228,21 +279,6 @@ openbox_openbox_SOURCES = \
        openbox/xerror.h
 
 
-## themetoxml ##
-
-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 ##
 
 tools_gnome_panel_control_gnome_panel_control_CPPFLAGS = \
@@ -252,6 +288,17 @@ tools_gnome_panel_control_gnome_panel_control_LDADD = \
 tools_gnome_panel_control_gnome_panel_control_SOURCES = \
        tools/gnome-panel-control/gnome-panel-control.c
 
+## gdm-control ##
+
+tools_gdm_control_gdm_control_CPPFLAGS = \
+       $(X_CFLAGS) \
+       $(GLIB_CFLAGS)
+tools_gdm_control_gdm_control_LDADD = \
+       $(X_LIBS) \
+       $(GLIB_LIBS)
+tools_gdm_control_gdm_control_SOURCES = \
+       tools/gdm-control/gdm-control.c
+
 
 ## default button masks ##
 dist_docxbm_DATA = \
@@ -270,11 +317,15 @@ dist_docxbm_DATA = \
 
 clearlooks_themedir = $(themedir)/Clearlooks/openbox-3
 dist_clearlooks_theme_DATA= \
-       themes/Clearlooks/openbox-3/themerc.xml
+       themes/Clearlooks/openbox-3/themerc
+
+clearlooks34_themedir = $(themedir)/Clearlooks/openbox-3
+dist_clearlooks34_theme_DATA= \
+       themes/Clearlooks-3.4/openbox-3/themerc
 
 clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3
 dist_clearlooksolive_theme_DATA= \
-       themes/Clearlooks-Olive/openbox-3/themerc.xml
+       themes/Clearlooks-Olive/openbox-3/themerc
 
 mikachu_themedir = $(themedir)/Mikachu/openbox-3
 dist_mikachu_theme_DATA= \
@@ -283,7 +334,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.xml
+       themes/Mikachu/openbox-3/themerc
 
 
 natura_themedir = $(themedir)/Natura/openbox-3
@@ -300,11 +351,11 @@ dist_natura_theme_DATA= \
        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
+       themes/Natura/openbox-3/themerc
 
 artwizboxed_themedir = $(themedir)/Artwiz-boxed/openbox-3
 dist_artwizboxed_theme_DATA= \
-       themes/Artwiz-boxed/openbox-3/themerc.xml
+       themes/Artwiz-boxed/openbox-3/themerc
 
 bear2_themedir = $(themedir)/Bear2/openbox-3
 dist_bear2_theme_DATA= \
@@ -319,11 +370,19 @@ dist_bear2_theme_DATA= \
        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
+       themes/Bear2/openbox-3/themerc
 
 orang_themedir = $(themedir)/Orang/openbox-3
 dist_orang_theme_DATA= \
-       themes/Orang/openbox-3/themerc.xml
+       themes/Orang/openbox-3/themerc
+
+onyx_themedir = $(themedir)/Onyx/openbox-3
+dist_onyx_theme_DATA= \
+       themes/Onyx/openbox-3/themerc
+
+onyxcitrus_themedir = $(themedir)/Onyx-Citrus/openbox-3
+dist_onyxcitrus_theme_DATA= \
+       themes/Onyx-Citrus/openbox-3/themerc
 
 syscrash_themedir = $(themedir)/Syscrash/openbox-3
 dist_syscrash_theme_DATA= \
@@ -331,7 +390,7 @@ dist_syscrash_theme_DATA= \
        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
+       themes/Syscrash/openbox-3/themerc
 
 ## public headers ##
 
@@ -359,80 +418,38 @@ nodist_pkgconfig_DATA = \
 dist_pixmap_DATA = \
        data/openbox.png
 
+nodist_rc_DATA = \
+       data/autostart.sh
+
 dist_rc_DATA = \
-       data/autostart.sh \
        data/rc.xml \
        data/menu.xml
 
 edit = $(SED) \
        -e 's!@version\@!$(VERSION)!' \
        -e 's!@configdir\@!$(configdir)!' \
+       -e 's!@secretbindir\@!$(secretbindir)!' \
        -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
+data/autostart.sh: $(srcdir)/data/autostart.sh.in Makefile
        @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
+%.desktop: %.desktop.in Makefile
        @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 $@
+       @$(edit) $< >$@ 
 
-data/xsession/openbox-kde-session: \
-               $(srcdir)/data/xsession/openbox-kde-session.in
+%-session: %-session.in Makefile
        @echo make: creating $@
-       @mkdir data 2>/dev/null || true
-       @mkdir data/xsession 2>/dev/null || true
-       @$(edit) $< >$@
-       @chmod a+x $@
+       @$(edit) $< >$@ 
 
-data/xsession/openbox-session: \
-               $(srcdir)/data/xsession/openbox-session.in
+%.1.in: %.1.sgml
        @echo make: creating $@
-       @mkdir data 2>/dev/null || true
-       @mkdir data/xsession 2>/dev/null || true
-       @$(edit) $< >$@
-       @chmod a+x $@
+       @docbook-to-man $< >$@
 
-doc/openbox.1: $(srcdir)/doc/openbox.1.sgml
+%.1: %.1.in Makefile
        @echo make: creating $@
-       @mkdir doc 2>/dev/null || true
-       @$(edit) $< | docbook-to-man - >$@
-
-doc/openbox-session.1: $(srcdir)/doc/openbox-session.1.sgml
-       @echo make: creating $@
-       @mkdir doc 2>/dev/null || true
-       @$(edit) $< | docbook-to-man - >$@
-
-doc/openbox-gnome-session.1: $(srcdir)/doc/openbox-gnome-session.1.sgml
-       @echo make: creating $@
-       @mkdir doc 2>/dev/null || true
-       @$(edit) $< | docbook-to-man - >$@
-
-doc/openbox-kde-session.1: $(srcdir)/doc/openbox-kde-session.1.sgml
-       @echo make: creating $@
-       @mkdir doc 2>/dev/null || true
-       @$(edit) $< | docbook-to-man - >$@
+       @$(edit) $< >$@ 
 
 dist_gnomewmfiles_DATA = \
        data/gnome-wm-properties/openbox.desktop
@@ -444,9 +461,9 @@ nodist_xsessions_DATA = \
 
 dist_noinst_DATA = \
        version.h.in \
+       data/autostart.sh.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 \
@@ -454,9 +471,13 @@ dist_noinst_DATA = \
        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 \
@@ -485,27 +506,30 @@ dist_doc_DATA = \
        COPYING \
        data/rc.xsd \
        data/menu.xsd \
-       data/themerc.xsd \
        doc/rc-mouse-focus.xml
 
-dist_man_MANS = \
+nodist_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
+       config.rpath
+
+# make clean doesn't delete these for some reason, even though they are
+# built by make
+CLEANFILES = \
+       doc/openbox.1 \
+       doc/openbox-session.1 \
+       doc/openbox-gnome-session.1 \
+       doc/openbox-kde-session.1 \
+       data/xsession/openbox-session \
+       data/xsession/openbox-gnome-session \
+       data/xsession/openbox-kde-session \
+       data/xsession/openbox.desktop \
+       data/xsession/openbox-gnome.desktop \
+       data/xsession/openbox-kde.desktop
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc