Merge branch 'backport' into work

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 786b97b0cb44f5a1e4d318d07bdbc2d7d46155db..4384054ab251e22b82b9c12ffa3b5244ff07748c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,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/obprop/obprop
 
 dist_secretbin_SCRIPTS = \
        tools/xdg-autostart/xdg-autostart
@@ -289,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
 
+## obprop ##
+
+tools_obprop_obprop_CPPFLAGS = \
+       $(GLIB_CFLAGS) \
+       $(X_CFLAGS)
+tools_obprop_obprop_LDADD = \
+       $(GLIB_LIBS) \
+       $(X_LIBS)
+tools_obprop_obprop_SOURCES = \
+       tools/obprop/obprop.c
+
 ## gdm-control ##
 
 tools_gdm_control_gdm_control_CPPFLAGS = \