configdir = $(sysconfdir)/xdg
rcdir = $(configdir)/openbox
xsessionsdir = $(datadir)/xsessions
+gnomesessiondir = $(datadir)/gnome-session/sessions
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@/obrender
pixmapdir = $(datadir)/pixmaps
xsddir = $(datadir)/openbox
-secretbindir = $(libdir)/openbox
appsdir = $(datadir)/applications
theme = Clearlooks
INCLUDES = -I.
check_PROGRAMS = \
- render/rendertest
+ obrender/rendertest
lib_LTLIBRARIES = \
- parser/libobparser.la \
- render/libobrender.la
+ obt/libobt.la \
+ obrender/libobrender.la
bin_PROGRAMS = \
openbox/openbox \
tools/gdm-control/gdm-control \
- tools/gnome-panel-control/gnome-panel-control
+ tools/gnome-panel-control/gnome-panel-control \
+ tools/obxprop/obxprop
-dist_secretbin_SCRIPTS = \
- tools/xdg-autostart/xdg-autostart
+noinst_PROGRAMS = \
+ obt/obt_unittests
nodist_bin_SCRIPTS = \
data/xsession/openbox-session \
data/xsession/openbox-gnome-session \
data/xsession/openbox-kde-session
-## render ##
+dist_rc_SCRIPTS = \
+ data/environment
-render_rendertest_CPPFLAGS = \
+nodist_rc_SCRIPTS = \
+ data/autostart/autostart
+
+dist_libexec_SCRIPTS = \
+ data/autostart/openbox-xdg-autostart
+
+nodist_libexec_SCRIPTS = \
+ data/autostart/openbox-autostart
+
+
+## obrender ##
+
+obrender_rendertest_CPPFLAGS = \
$(PANGO_CFLAGS) \
- $(XFT_CFLAGS) \
$(GLIB_CFLAGS) \
-DG_LOG_DOMAIN=\"RenderTest\"
-render_rendertest_LDADD = \
- parser/libobparser.la \
- render/libobrender.la \
+obrender_rendertest_LDADD = \
+ obt/libobt.la \
+ obrender/libobrender.la \
$(GLIB_LIBS) \
$(PANGO_LIBS) \
- $(XFT_LIBS) \
$(XML_LIBS) \
$(X_LIBS)
-render_rendertest_SOURCES = render/test.c
+obrender_rendertest_SOURCES = obrender/test.c
-render_libobrender_la_CPPFLAGS = \
+obrender_libobrender_la_CPPFLAGS = \
$(X_CFLAGS) \
$(GLIB_CFLAGS) \
$(XML_CFLAGS) \
$(PANGO_CFLAGS) \
- $(XFT_CFLAGS) \
+ $(IMLIB2_CFLAGS) \
+ $(LIBRSVG_CFLAGS) \
-DG_LOG_DOMAIN=\"ObRender\" \
-DDEFAULT_THEME=\"$(theme)\"
-render_libobrender_la_LDFLAGS = \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-render_libobrender_la_LIBADD = \
- parser/libobparser.la \
+obrender_libobrender_la_LDFLAGS = \
+ -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE)
+obrender_libobrender_la_LIBADD = \
+ obt/libobt.la \
$(X_LIBS) \
$(PANGO_LIBS) \
- $(XFT_LIBS) \
$(GLIB_LIBS) \
+ $(IMLIB2_LIBS) \
+ $(LIBRSVG_LIBS) \
$(XML_LIBS)
-render_libobrender_la_SOURCES = \
+obrender_libobrender_la_SOURCES = \
gettext.h \
- render/color.h \
- render/color.c \
- render/font.h \
- render/font.c \
- render/geom.h \
- render/gradient.h \
- render/gradient.c \
- 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/mask.c \
- render/render.h \
- render/render.c \
- render/theme.h \
- render/theme.c
-
-## parser ##
-
-parser_libobparser_la_CPPFLAGS = \
+ obrender/button.c \
+ obrender/color.h \
+ obrender/color.c \
+ obrender/font.h \
+ obrender/font.c \
+ obrender/geom.h \
+ obrender/gradient.h \
+ obrender/gradient.c \
+ obrender/icon.h \
+ obrender/image.h \
+ obrender/image.c \
+ obrender/imagecache.h \
+ obrender/imagecache.c \
+ obrender/instance.h \
+ obrender/instance.c \
+ obrender/mask.h \
+ obrender/mask.c \
+ obrender/render.h \
+ obrender/render.c \
+ obrender/theme.h \
+ obrender/theme.c
+
+## obt ##
+
+obt_libobt_la_CPPFLAGS = \
+ $(X_CFLAGS) \
+ $(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 = \
+ $(X_LIBS) \
+ $(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/bsearch.h \
+ obt/display.h \
+ obt/display.c \
+ obt/internal.h \
+ obt/keyboard.h \
+ obt/keyboard.c \
+ obt/xml.h \
+ obt/xml.c \
+ obt/ddparse.h \
+ obt/ddparse.c \
+ obt/link.h \
+ obt/link.c \
+ obt/paths.h \
+ obt/paths.c \
+ obt/prop.h \
+ obt/prop.c \
+ obt/signal.h \
+ obt/signal.c \
+ obt/util.h \
+ obt/xqueue.h \
+ obt/xqueue.c
## openbox ##
openbox_openbox_CPPFLAGS = \
$(SM_CFLAGS) \
- $(XINERAMA_CFLAGS) \
- $(XKB_CFLAGS) \
- $(XRANDR_CFLAGS) \
- $(XSHAPE_CFLAGS) \
- $(XSYNC_CFLAGS) \
$(X_CFLAGS) \
$(XCURSOR_CFLAGS) \
$(SM_CFLAGS) \
-DCONFIGDIR=\"$(configdir)\" \
-DG_LOG_DOMAIN=\"Openbox\"
openbox_openbox_LDADD = \
- $(SM_LIBS) \
$(XINERAMA_LIBS) \
- $(XKB_LIBS) \
$(XRANDR_LIBS) \
- $(XSHAPE_LIBS) \
- $(XSYNC_LIBS) \
+ $(SM_LIBS) \
$(GLIB_LIBS) \
$(X_LIBS) \
$(XCURSOR_LIBS) \
$(XML_LIBS) \
$(EFENCE_LIBS) \
$(LIBINTL) \
- render/libobrender.la \
- parser/libobparser.la
+ obrender/libobrender.la \
+ obt/libobt.la
openbox_openbox_LDFLAGS = -export-dynamic
openbox_openbox_SOURCES = \
gettext.h \
openbox/actions/debug.c \
openbox/actions/decorations.c \
openbox/actions/desktop.c \
+ openbox/actions/dock.c \
openbox/actions/dockautohide.c \
openbox/actions/directionalwindows.c \
openbox/actions/execute.c \
openbox/actions/resizerelative.c \
openbox/actions/restart.c \
openbox/actions/shade.c \
+ openbox/actions/shadelowerraise.c \
openbox/actions/showdesktop.c \
openbox/actions/showmenu.c \
openbox/actions/unfocus.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/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/ping.h \
openbox/place.c \
openbox/place.h \
+ openbox/place_overlap.c \
+ openbox/place_overlap.h \
openbox/prompt.c \
openbox/prompt.h \
openbox/popup.c \
openbox/popup.h \
- openbox/prop.c \
- openbox/prop.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
+ openbox/window.h
+
+## obt_unittests ##
+obt_obt_unittests_CPPFLAGS = \
+ $(GLIB_CFLAGS) \
+ -DLOCALEDIR=\"$(localedir)\" \
+ -DDATADIR=\"$(datadir)\" \
+ -DCONFIGDIR=\"$(configdir)\" \
+ -DG_LOG_DOMAIN=\"Obt-Unittests\"
+obt_obt_unittests_LDADD = \
+ $(GLIB_LIBS) \
+ obt/libobt.la
+obt_obt_unittests_LDFLAGS = -export-dynamic
+obt_obt_unittests_SOURCES = \
+ obt/unittest_base.c \
+ obt/bsearch_unittest.c
## gnome-panel-control ##
tools_gnome_panel_control_gnome_panel_control_SOURCES = \
tools/gnome-panel-control/gnome-panel-control.c
+## obxprop ##
+
+tools_obxprop_obxprop_CPPFLAGS = \
+ $(GLIB_CFLAGS) \
+ $(X_CFLAGS)
+tools_obxprop_obxprop_LDADD = \
+ $(GLIB_LIBS) \
+ $(X_LIBS)
+tools_obxprop_obxprop_SOURCES = \
+ tools/obxprop/obxprop.c
+
## gdm-control ##
tools_gdm_control_gdm_control_CPPFLAGS = \
+ $(XAUTH_CFLAGS) \
$(X_CFLAGS) \
$(GLIB_CFLAGS)
tools_gdm_control_gdm_control_LDADD = \
+ $(XAUTH_LIBS) \
$(X_LIBS) \
$(GLIB_LIBS)
tools_gdm_control_gdm_control_SOURCES = \
dist_clearlooks_theme_DATA= \
themes/Clearlooks/openbox-3/themerc
-clearlooks34_themedir = $(themedir)/Clearlooks/openbox-3
+clearlooks34_themedir = $(themedir)/Clearlooks-3.4/openbox-3
dist_clearlooks34_theme_DATA= \
themes/Clearlooks-3.4/openbox-3/themerc
## public headers ##
-pubinclude_HEADERS = \
- render/color.h \
- render/font.h \
- render/geom.h \
- render/gradient.h \
- render/image.h \
- render/instance.h \
- render/mask.h \
- render/render.h \
- render/theme.h \
- parser/parse.h
-
-nodist_pubinclude_HEADERS = \
- version.h
+rrpubinclude_HEADERS = \
+ obrender/color.h \
+ obrender/font.h \
+ obrender/geom.h \
+ obrender/gradient.h \
+ obrender/image.h \
+ obrender/instance.h \
+ obrender/mask.h \
+ obrender/render.h \
+ obrender/theme.h \
+ obrender/version.h
+
+obtpubinclude_HEADERS = \
+ obt/link.h \
+ obt/display.h \
+ obt/keyboard.h \
+ obt/xml.h \
+ obt/paths.h \
+ obt/prop.h \
+ obt/signal.h \
+ obt/util.h \
+ obt/version.h \
+ obt/xqueue.h
nodist_pkgconfig_DATA = \
- render/obrender-3.0.pc \
- parser/obparser-3.0.pc
+ obrender/obrender-3.5.pc \
+ obt/obt-3.5.pc
## data ##
dist_pixmap_DATA = \
data/openbox.png
-nodist_rc_DATA = \
- data/autostart.sh
-
dist_rc_DATA = \
data/rc.xml \
data/menu.xml
edit = $(SED) \
-e 's!@version\@!$(VERSION)!' \
-e 's!@configdir\@!$(configdir)!' \
- -e 's!@secretbindir\@!$(secretbindir)!' \
+ -e 's!@rcdir\@!$(rcdir)!' \
+ -e 's!@libexecdir\@!$(libexecdir)!' \
-e 's!@bindir\@!$(bindir)!'
-data/autostart.sh: $(srcdir)/data/autostart.sh.in Makefile
+data/autostart/autostart: $(top_srcdir)/data/autostart/autostart.in Makefile
@echo make: creating $@
- @$(edit) $< >$@
+ @test -d $(shell dirname $(top_builddir)/$@) || \
+ mkdir $(shell dirname $(top_builddir)/$@)
+ @$(edit) $< >$(top_builddir)/$@
+
+data/autostart/openbox-autostart: $(top_srcdir)/data/autostart/openbox-autostart.in Makefile
+ @echo make: creating $@
+ @test -d $(shell dirname $(top_builddir)/$@) || \
+ mkdir $(shell dirname $(top_builddir)/$@)
+ @$(edit) $< >$(top_builddir)/$@
%.desktop: %.desktop.in Makefile
@echo make: creating $@
data/xsession/openbox-gnome.desktop \
data/xsession/openbox-kde.desktop
+dist_gnomesession_DATA = \
+ data/gnome-session/openbox-gnome.session \
+ data/gnome-session/openbox-gnome-fallback.session
+
dist_noinst_DATA = \
- version.h.in \
- data/autostart.sh.in \
data/rc.xsd \
data/menu.xsd \
+ data/autostart/autostart.in \
+ data/autostart/openbox-autostart.in \
data/xsession/openbox.desktop.in \
data/xsession/openbox-gnome.desktop.in \
data/xsession/openbox-kde.desktop.in \
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 \
+ doc/obxprop.1.sgml \
+ doc/obxprop.1.in \
+ obrender/version.h.in \
+ obrender/obrender-3.5.pc.in \
+ obt/obt-3.5.pc.in \
+ obt/version.h.in \
tools/themeupdate/themeupdate.py \
tests/hideshow.py \
tests/Makefile \
doc/openbox.1 \
doc/openbox-session.1 \
doc/openbox-gnome-session.1 \
- doc/openbox-kde-session.1
+ doc/openbox-kde-session.1 \
+ doc/obxprop.1
EXTRA_DIST = \
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
+ $(nodist_man_MANS) \
+ $(nodist_bin_SCRIPTS) \
+ $(nodist_xsessions_DATA) \
+ $(nodist_rc_SCRIPTS) \
+ $(nodist_libexec_SCRIPTS)
#doc:
# $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc
distclean-local:
- for d in . m4 po render; do \
+ for d in . m4 po obrender parser obt openbox; do \
for p in core core.* gmon.out *\~ *.orig *.rej .\#*; do \
rm -f "$$d/$$p"; \
done \
projects / mikachu / openbox.git / blobdiff