Fix a copypasto that broke interactive keybinds with meta and hyper keys
[dana/openbox.git] / Makefile.am
index 9027759..62570bd 100644 (file)
@@ -9,10 +9,10 @@ xsessionsdir    = $(datadir)/xsessions
 gnomewmfilesdir = $(datadir)/gnome/wm-properties
 pkgconfigdir    = $(libdir)/pkgconfig
 obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt
-rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/render
+rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/obrender
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
-secretbindir    = $(libdir)/openbox
+appsdir         = $(datadir)/applications
 
 theme = Clearlooks
 
@@ -23,80 +23,85 @@ ACLOCAL_AMFLAGS = -I m4
 INCLUDES = -I.
 
 check_PROGRAMS = \
-       render/rendertest
+       obrender/rendertest
 
 lib_LTLIBRARIES = \
        obt/libobt.la \
-       render/libobrender.la
+       obrender/libobrender.la
 
 bin_PROGRAMS = \
        openbox/openbox \
-       tools/gnome-panel-control/gnome-panel-control
-
-dist_secretbin_SCRIPTS = \
-       tools/xdg-autostart/xdg-autostart
+       tools/gdm-control/gdm-control \
+       tools/gnome-panel-control/gnome-panel-control \
+       tools/obxprop/obxprop
 
 nodist_bin_SCRIPTS = \
        data/xsession/openbox-session \
        data/xsession/openbox-gnome-session \
        data/xsession/openbox-kde-session
 
-## render ##
+dist_rc_SCRIPTS = \
+       data/environment \
+       data/autostart/autostart
+
+dist_libexec_SCRIPTS = \
+       data/autostart/openbox-xdg-autostart \
+       data/autostart/openbox-autostart
+
 
-render_rendertest_CPPFLAGS = \
+## obrender ##
+
+obrender_rendertest_CPPFLAGS = \
        $(PANGO_CFLAGS) \
-       $(XFT_CFLAGS) \
        $(GLIB_CFLAGS) \
        -DG_LOG_DOMAIN=\"RenderTest\"
-render_rendertest_LDADD = \
+obrender_rendertest_LDADD = \
        obt/libobt.la \
-       render/libobrender.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) \
        -DG_LOG_DOMAIN=\"ObRender\" \
        -DDEFAULT_THEME=\"$(theme)\"
-render_libobrender_la_LDFLAGS = \
+obrender_libobrender_la_LDFLAGS = \
        -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE)
-render_libobrender_la_LIBADD = \
-       obt/libobt.la \
+obrender_libobrender_la_LIBADD = \
        $(X_LIBS) \
        $(PANGO_LIBS) \
-       $(XFT_LIBS) \
        $(GLIB_LIBS) \
+       $(IMLIB2_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
+       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 ##
 
@@ -123,22 +128,29 @@ obt_libobt_la_LIBADD = \
        $(GLIB_LIBS) \
        $(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/mainloop.h \
-       obt/mainloop.c \
-       obt/parse.h \
-       obt/parse.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/xevent.h \
-       obt/xevent.c
+       obt/watch.h \
+       obt/watch.c \
+       obt/xqueue.h \
+       obt/xqueue.c
 
 ## openbox ##
 
@@ -164,7 +176,7 @@ openbox_openbox_LDADD = \
        $(XML_LIBS) \
        $(EFENCE_LIBS) \
        $(LIBINTL) \
-       render/libobrender.la \
+       obrender/libobrender.la \
        obt/libobt.la
 openbox_openbox_LDFLAGS = -export-dynamic
 openbox_openbox_SOURCES = \
@@ -178,6 +190,7 @@ openbox_openbox_SOURCES = \
        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 \
@@ -204,6 +217,7 @@ openbox_openbox_SOURCES = \
        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 \
@@ -242,8 +256,6 @@ openbox_openbox_SOURCES = \
        openbox/grab.h \
        openbox/group.c \
        openbox/group.h \
-       openbox/hooks.c \
-       openbox/hooks.h \
        openbox/keyboard.c \
        openbox/keyboard.h \
        openbox/keytree.c \
@@ -283,6 +295,7 @@ openbox_openbox_SOURCES = \
        openbox/window.c \
        openbox/window.h
 
+
 ## gnome-panel-control ##
 
 tools_gnome_panel_control_gnome_panel_control_CPPFLAGS = \
@@ -292,6 +305,28 @@ tools_gnome_panel_control_gnome_panel_control_LDADD = \
 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 = \
+       $(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 = \
@@ -388,40 +423,42 @@ dist_syscrash_theme_DATA= \
 ## public headers ##
 
 rrpubinclude_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 \
-       render/version.h
+       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/mainloop.h \
-       obt/parse.h \
+       obt/xml.h \
        obt/paths.h \
        obt/prop.h \
+       obt/signal.h \
        obt/util.h \
        obt/version.h \
-       obt/xevent.h
+       obt/watch.h \
+       obt/xqueue.h
 
 nodist_pkgconfig_DATA = \
-       render/obrender-4.0.pc \
-       obt/obt-4.0.pc
+       obrender/obrender-3.5.pc \
+       obt/obt-3.5.pc
 
 ## data ##
 
+dist_apps_DATA = \
+       data/openbox.desktop
+
 dist_pixmap_DATA = \
        data/openbox.png
 
-nodist_rc_DATA = \
-       data/autostart.sh
-
 dist_rc_DATA = \
        data/rc.xml \
        data/menu.xml
@@ -429,10 +466,14 @@ dist_rc_DATA = \
 edit = $(SED) \
        -e 's!@version\@!$(VERSION)!' \
        -e 's!@configdir\@!$(configdir)!' \
-       -e 's!@secretbindir\@!$(secretbindir)!' \
+       -e 's!@libexecdir\@!$(libexecdir)!' \
        -e 's!@bindir\@!$(bindir)!'
 
-data/autostart.sh: $(srcdir)/data/autostart.sh.in Makefile
+data/autostart/autostart: $(srcdir)/data/autostart/autostart.in Makefile
+       @echo make: creating $@
+       @$(edit) $< >$@
+
+data/autostart/openbox-autostart: $(srcdir)/data/autostart/openbox-autostart.in Makefile
        @echo make: creating $@
        @$(edit) $< >$@
 
@@ -461,9 +502,10 @@ nodist_xsessions_DATA = \
        data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
-       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 \
@@ -478,9 +520,11 @@ dist_noinst_DATA = \
        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 \
+       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 \
@@ -514,7 +558,8 @@ nodist_man_MANS = \
        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
@@ -537,7 +582,7 @@ CLEANFILES = \
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc
 
 distclean-local:
-       for d in . m4 po render parser obt openbox; 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 \