xsessionsdir = $(datadir)/xsessions
gnomewmfilesdir = $(datadir)/gnome/wm-properties
pkgconfigdir = $(libdir)/pkgconfig
-pubincludedir = $(includedir)/openbox/@OB_VERSION@/openbox
+obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt
+rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/render
pixmapdir = $(datadir)/pixmaps
xsddir = $(datadir)/openbox
render/rendertest
lib_LTLIBRARIES = \
- parser/libobparser.la \
- render/libobrender.la
+ render/libobrender.la \
+ obt/libobt.la
bin_PROGRAMS = \
openbox/openbox \
tools/gnome-panel-control/gnome-panel-control
bin_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 = \
$(GLIB_CFLAGS) \
-DG_LOG_DOMAIN=\"RenderTest\"
render_rendertest_LDADD = \
- parser/libobparser.la \
+ obt/libobt.la \
render/libobrender.la \
$(GLIB_LIBS) \
$(PANGO_LIBS) \
-DG_LOG_DOMAIN=\"ObRender\" \
-DDEFAULT_THEME=\"$(theme)\"
render_libobrender_la_LDFLAGS = \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE)
render_libobrender_la_LIBADD = \
- parser/libobparser.la \
+ obt/libobt.la \
$(X_LIBS) \
$(PANGO_LIBS) \
$(XFT_LIBS) \
render/icon.h \
render/image.h \
render/image.c \
+ render/imagecache.h \
+ render/imagecache.c \
render/instance.h \
render/instance.c \
render/mask.h \
render/theme.h \
render/theme.c
-## parser ##
+## obt ##
-parser_libobparser_la_CPPFLAGS = \
+obt_libobt_la_CPPFLAGS = \
+ $(XINERAMA_CFLAGS) \
+ $(XKB_CFLAGS) \
+ $(XRANDR_CFLAGS) \
+ $(XSHAPE_CFLAGS) \
+ $(XSYNC_CFLAGS) \
$(GLIB_CFLAGS) \
$(XML_CFLAGS) \
- -DG_LOG_DOMAIN=\"ObParser\" \
+ -DG_LOG_DOMAIN=\"Obt\" \
-DLOCALEDIR=\"$(localedir)\" \
-DDATADIR=\"$(datadir)\" \
-DCONFIGDIR=\"$(configdir)\"
-parser_libobparser_la_LDFLAGS = \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-parser_libobparser_la_LIBADD = \
+obt_libobt_la_LDFLAGS = \
+ -version-info $(OBT_CURRENT):$(OBT_REVISION):$(OBT_AGE)
+obt_libobt_la_LIBADD = \
+ $(XINERAMA_LIBS) \
+ $(XKB_LIBS) \
+ $(XRANDR_LIBS) \
+ $(XSHAPE_LIBS) \
+ $(XSYNC_LIBS) \
$(GLIB_LIBS) \
- $(XML_LIBS)
-parser_libobparser_la_SOURCES = \
- parser/parse.h \
- parser/parse.c
+ $(XML_LIBS)
+obt_libobt_la_SOURCES = \
+ obt/display.h \
+ obt/display.c \
+ obt/internal.h \
+ obt/keyboard.h \
+ obt/keyboard.c \
+ obt/mainloop.h \
+ obt/mainloop.c \
+ obt/parse.h \
+ obt/parse.c \
+ obt/paths.h \
+ obt/paths.c \
+ obt/prop.h \
+ obt/prop.c \
+ obt/util.h \
+ obt/xevent.h \
+ obt/xevent.c
## openbox ##
openbox_openbox_CPPFLAGS = \
$(SM_CFLAGS) \
- $(XINERAMA_CFLAGS) \
- $(XKB_CFLAGS) \
- $(XRANDR_CFLAGS) \
- $(XSHAPE_CFLAGS) \
- $(XSYNC_CFLAGS) \
$(X_CFLAGS) \
$(XCURSOR_CFLAGS) \
$(SM_CFLAGS) \
-DG_LOG_DOMAIN=\"Openbox\"
openbox_openbox_LDADD = \
$(SM_LIBS) \
- $(XINERAMA_LIBS) \
- $(XKB_LIBS) \
- $(XRANDR_LIBS) \
- $(XSHAPE_LIBS) \
- $(XSYNC_LIBS) \
$(GLIB_LIBS) \
$(X_LIBS) \
$(XCURSOR_LIBS) \
$(EFENCE_LIBS) \
$(LIBINTL) \
render/libobrender.la \
- parser/libobparser.la
+ obt/libobt.la
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/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 \
openbox/dock.h \
openbox/event.c \
openbox/event.h \
- openbox/extensions.c \
- 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 \
openbox/keyboard.h \
openbox/keytree.c \
openbox/keytree.h \
- openbox/mainloop.c \
- openbox/mainloop.h \
openbox/menuframe.c \
openbox/menuframe.h \
openbox/menu.c \
openbox/menu.h \
openbox/misc.h \
- openbox/modkeys.c \
- openbox/modkeys.h \
openbox/mouse.c \
openbox/mouse.h \
openbox/moveresize.c \
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 \
openbox/translate.c \
openbox/translate.h \
openbox/window.c \
- openbox/window.h \
- openbox/xerror.c \
- 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
-
+ openbox/window.h
## gnome-panel-control ##
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= \
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
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= \
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= \
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 ##
-pubinclude_HEADERS = \
+rrpubinclude_HEADERS = \
render/color.h \
render/font.h \
render/geom.h \
render/mask.h \
render/render.h \
render/theme.h \
- parser/parse.h
-
-nodist_pubinclude_HEADERS = \
- version.h
+ render/version.h
+
+obtpubinclude_HEADERS = \
+ obt/display.h \
+ obt/keyboard.h \
+ obt/mainloop.h \
+ obt/parse.h \
+ obt/paths.h \
+ obt/prop.h \
+ obt/util.h \
+ obt/version.h \
+ obt/xevent.h
nodist_pkgconfig_DATA = \
- render/obrender-3.0.pc \
- parser/obparser-3.0.pc
+ render/obrender-4.0.pc \
+ obt/obt-4.0.pc
## data ##
data/openbox.png
dist_rc_DATA = \
+ data/autostart.sh \
data/rc.xml \
data/menu.xml
-e 's!@configdir\@!$(configdir)!' \
-e 's!@bindir\@!$(bindir)!'
-data/xsession/openbox-gnome-session: \
- $(srcdir)/data/xsession/openbox-gnome-session.in
+%.desktop: %.desktop.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-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) $< >$@
-doc/openbox.1.in: $(srcdir)/doc/openbox.1.sgml
+%.1.in: %.1.sgml
@echo make: creating $@
- @mkdir doc 2>/dev/null || true
- @docbook-to-man $< > $@
+ @docbook-to-man $< >$@
-doc/openbox.1: doc/openbox.1.in
+%.1: %.1.in Makefile
@echo make: creating $@
- @mkdir doc 2>/dev/null || true
- @$(edit) $< >$@
-
-doc/openbox-gnome-session.1: $(srcdir)/doc/openbox-gnome-session.1.sgml
- @echo make: creating $@
- @mkdir doc 2>/dev/null || true
- @docbook-to-man $< > $@
-
-doc/openbox-kde-session.1: $(srcdir)/doc/openbox-kde-session.1.sgml
- @echo make: creating $@
- @mkdir doc 2>/dev/null || true
- @docbook-to-man $< > $@
+ @$(edit) $< >$@
dist_gnomewmfiles_DATA = \
data/gnome-wm-properties/openbox.desktop
-dist_xsessions_DATA = \
+nodist_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/conffiles \
- debian/control \
- debian/copyright \
- debian/menu \
- debian/postinst \
- debian/postrm \
- debian/rules \
- version.h.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 \
- render/obrender-3.0.pc.in \
- parser/obparser-3.0.pc.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/version.h.in \
+ render/obrender-4.0.pc.in \
+ obt/obt-4.0.pc.in \
+ obt/version.h.in \
tools/themeupdate/themeupdate.py \
tests/hideshow.py \
tests/Makefile \
COMPLIANCE \
README \
AUTHORS \
+ CHANGELOG \
+ 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 = \
- config.rpath \
- mkinstalldirs \
- CHANGELOG \
- COPYING
+ 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
distclean-local:
- for d in . m4 po render; do \
+ for d in . m4 po render parser obt openbox; do \
for p in core core.* gmon.out *\~ *.orig *.rej .\#*; do \
rm -f "$$d/$$p"; \
done \