build 'openbox' instead of 'openbox3'.

add the openbox.desktop file for gnome compat.

diff --git a/openbox/Makefile.am b/openbox/Makefile.am
index 0b1fec9a9d0a22637ee742c1ba050f22f438cbc8..adc06bf8f2cf464e89179a5db443fca75249c20c 100644 (file)
--- a/openbox/Makefile.am
+++ b/openbox/Makefile.am
@@ -1,8 +1,9 @@
 localedir=$(datadir)/locale
 rcdir=$(datadir)/openbox
 plugindir=$(libdir)/openbox/plugins
+desktopfilesdir=$(datadir)/gnome/wm-properties
 
-binary=openbox3
+binary=openbox
 url=http://openbox.org/
 
 CPPFLAGS=$(X_CFLAGS) $(SM_CFLAGS) $(XFT_CFLAGS) $(GLIB_CFLAGS) \
@@ -21,13 +22,13 @@ LIBS=$(X_LIBS) $(SM_LIBS) $(XFT_LIBS) $(XINERAMA_LIBS) $(XKB_LIBS) \
 
 bin_PROGRAMS=$(binary)
 
-openbox3_LDADD=-lobrender -L../render -lobparser -L../parser
-openbox3_LDFLAGS=-export-dynamic
-openbox3_SOURCES=action.c client.c config.c \
-                 extensions.c focus.c frame.c grab.c menu.c menu_render.c \
-                 openbox.c framerender.c plugin.c prop.c screen.c \
-                 stacking.c dispatch.c event.c group.c timer.c xerror.c \
-                 moveresize.c startup.c popup.c dock.c window.c
+openbox_LDADD=-lobrender -L../render -lobparser -L../parser
+openbox_LDFLAGS=-export-dynamic
+openbox_SOURCES=action.c client.c config.c \
+                extensions.c focus.c frame.c grab.c menu.c menu_render.c \
+                openbox.c framerender.c plugin.c prop.c screen.c \
+                stacking.c dispatch.c event.c group.c timer.c xerror.c \
+                moveresize.c startup.c popup.c dock.c window.c
 
 noinst_HEADERS=action.h client.h config.h dispatch.h event.h extensions.h \
                focus.h frame.h framerender.h geom.h gettext.h grab.h group.h \
@@ -35,6 +36,8 @@ noinst_HEADERS=action.h client.h config.h dispatch.h event.h extensions.h \
                stacking.h timer.h xerror.h moveresize.h startup.h popup.h \
                dock.h window.h
 
+desktopfiles_DATA=openbox.desktop
+
 MAINTAINERCLEANFILES=Makefile.in
 
 distclean-local: