X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=14786f57d9e225c2327209148d15c34584c30b54;hb=f163c46eaf01ced8405fa36a3bf4a5c488f0f5aa;hp=fa8f65d323105c2e238801fd3f73313f2d8bd0a2;hpb=b1dc814128c2cd402ef7b6717348a795a3c0ad14;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index fa8f65d3..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
 
@@ -30,9 +31,11 @@ lib_LTLIBRARIES = \
 
 bin_PROGRAMS = \
 	openbox/openbox \
-	tools/gnome-panel-control/gnome-panel-control
+	tools/gdm-control/gdm-control \
+	tools/gnome-panel-control/gnome-panel-control \
+	tools/obxprop/obxprop
 
-secretbin_SCRIPTS = \
+dist_secretbin_SCRIPTS = \
 	tools/xdg-autostart/xdg-autostart
 
 nodist_bin_SCRIPTS = \
@@ -286,6 +289,28 @@ 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 = \
+	$(X_CFLAGS) \
+	$(GLIB_CFLAGS)
+tools_gdm_control_gdm_control_LDADD = \
+	$(X_LIBS) \
+	$(GLIB_LIBS)
+tools_gdm_control_gdm_control_SOURCES = \
+	tools/gdm-control/gdm-control.c
+
 
 ## default button masks ##
 dist_docxbm_DATA = \
@@ -402,11 +427,16 @@ nodist_pkgconfig_DATA = \
 
 ## data ##
 
+dist_apps_DATA = \
+	data/openbox.desktop
+
 dist_pixmap_DATA = \
 	data/openbox.png
 
+nodist_rc_DATA = \
+	data/autostart.sh
+
 dist_rc_DATA = \
-	data/autostart.sh \
 	data/rc.xml \
 	data/menu.xml
 
@@ -446,6 +476,7 @@ nodist_xsessions_DATA = \
 
 dist_noinst_DATA = \
 	version.h.in \
+	data/autostart.sh.in \
 	data/rc.xsd \
 	data/menu.xsd \
 	data/xsession/openbox.desktop.in \
@@ -462,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 \