X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=4b3e0b50cfe50f75666d1fd292c119a58713dc49;hb=d6625739427798a7d5a972b2173f400ea1fa7fc7;hp=6a6f1754bc76e587c92bee60194c62981185f653;hpb=d9739288b7e0efa9082ecc3b8af65ba9c3760692;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 6a6f1754..4b3e0b50 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/obprop/obprop
 
 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
 
+## 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 = \
@@ -415,6 +427,9 @@ nodist_pkgconfig_DATA = \
 
 ## data ##
 
+dist_apps_DATA = \
+	data/openbox.desktop
+
 dist_pixmap_DATA = \
 	data/openbox.png