Pass NULL, not 0, handle invalid --id better.

[dana/openbox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4b3e0b5..14786f5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@ bin_PROGRAMS = \
        openbox/openbox \
        tools/gdm-control/gdm-control \
        tools/gnome-panel-control/gnome-panel-control \
-       tools/obprop/obprop
+       tools/obxprop/obxprop
 
 dist_secretbin_SCRIPTS = \
        tools/xdg-autostart/xdg-autostart
@@ -289,16 +289,16 @@ 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 ##
+## obxprop ##
 
-tools_obprop_obprop_CPPFLAGS = \
+tools_obxprop_obxprop_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(X_CFLAGS)
-tools_obprop_obprop_LDADD = \
+tools_obxprop_obxprop_LDADD = \
        $(GLIB_LIBS) \
        $(X_LIBS)
-tools_obprop_obprop_SOURCES = \
-       tools/obprop/obprop.c
+tools_obxprop_obxprop_SOURCES = \
+       tools/obxprop/obxprop.c
 
 ## gdm-control ##
 
@@ -493,6 +493,8 @@ dist_noinst_DATA = \
        doc/openbox-gnome-session.1.in \
        doc/openbox-kde-session.1.sgml \
        doc/openbox-kde-session.1.in \
+       doc/obxprop.1.sgml \
+       doc/obxprop.1.in \
        render/obrender-3.0.pc.in \
        parser/obparser-3.0.pc.in \
        tools/themeupdate/themeupdate.py \