X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=14786f57d9e225c2327209148d15c34584c30b54;hb=14180a6b0dee05e73fd193db28fd94b4ef3046d1;hp=6a6f1754bc76e587c92bee60194c62981185f653;hpb=d9739288b7e0efa9082ecc3b8af65ba9c3760692;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 6a6f1754..14786f57 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,7 @@ pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
 secretbindir    = $(libdir)/openbox
+appsdir         = $(datadir)/applications
 
 theme = Clearlooks
 
@@ -31,7 +32,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
@@ -176,7 +178,6 @@ openbox_openbox_SOURCES = \
 	openbox/actions/if.c \
 	openbox/actions/kill.c \
 	openbox/actions/layer.c \
-	openbox/actions/session.c \
 	openbox/actions/lower.c \
 	openbox/actions/maximize.c \
 	openbox/actions/move.c \
@@ -288,6 +289,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 = \
@@ -415,6 +427,9 @@ nodist_pkgconfig_DATA = \
 
 ## data ##
 
+dist_apps_DATA = \
+	data/openbox.desktop
+
 dist_pixmap_DATA = \
 	data/openbox.png
 
@@ -478,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 \