Merge branch 'backport' into work

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c72a40b3d2c3e63d022470e419faef34ed3c33e5..3934b62f4879ae9ae8c74a7a94d113e2eb12820b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,6 +13,7 @@ rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/render
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
 secretbindir    = $(libdir)/openbox
+appsdir         = $(datadir)/applications
 
 theme = Clearlooks
 
@@ -32,7 +33,8 @@ lib_LTLIBRARIES = \
 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
@@ -288,6 +290,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
 
+## 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 = \
@@ -423,6 +436,9 @@ nodist_pkgconfig_DATA = \
 
 ## data ##
 
+dist_apps_DATA = \
+       data/openbox.desktop
+
 dist_pixmap_DATA = \
        data/openbox.png