Unused variable guint old

[mikachu/openbox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6a6f175..fe6ef92 100644 (file)
--- 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
@@ -173,10 +175,8 @@ openbox_openbox_SOURCES = \
        openbox/actions/fullscreen.c \
        openbox/actions/growtoedge.c \
        openbox/actions/iconify.c \
-       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 \
@@ -191,6 +191,7 @@ openbox_openbox_SOURCES = \
        openbox/actions/resizerelative.c \
        openbox/actions/restart.c \
        openbox/actions/shade.c \
+       openbox/actions/shadelowerraise.c \
        openbox/actions/showdesktop.c \
        openbox/actions/showmenu.c \
        openbox/actions/unfocus.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 \
@@ -512,7 +529,8 @@ nodist_man_MANS = \
        doc/openbox.1 \
        doc/openbox-session.1 \
        doc/openbox-gnome-session.1 \
-       doc/openbox-kde-session.1
+       doc/openbox-kde-session.1 \
+       doc/obxprop.1
 
 EXTRA_DIST = \
        config.rpath
@@ -529,7 +547,8 @@ CLEANFILES = \
        data/xsession/openbox-kde-session \
        data/xsession/openbox.desktop \
        data/xsession/openbox-gnome.desktop \
-       data/xsession/openbox-kde.desktop
+       data/xsession/openbox-kde.desktop \
+       data/autostart.sh
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc