X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2FMakefile.am;h=adc06bf8f2cf464e89179a5db443fca75249c20c;hb=1ff042579e2cbe367807ed6c8a15e71dfae2a526;hp=fc9f4ae3ec90fa1d55c019eb8b0030c999f7b30e;hpb=d1e355de2c6aae38cea3cdc0e0b902ea2b194e86;p=chaz%2Fopenbox

diff --git a/openbox/Makefile.am b/openbox/Makefile.am
index fc9f4ae3..adc06bf8 100644
--- a/openbox/Makefile.am
+++ b/openbox/Makefile.am
@@ -1,12 +1,14 @@
 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) $(XFT_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) \
-         $(LIBSN_CFLAGS) $(GL_CFLAGS) $(XML_CFLAGS) @CPPFLAGS@ \
+CPPFLAGS=$(X_CFLAGS) $(SM_CFLAGS) $(XFT_CFLAGS) $(GLIB_CFLAGS) \
+         $(GMODULE_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) $(XML_CFLAGS) \
+         @CPPFLAGS@ \
          -DLOCALEDIR=\"$(localedir)\" \
          -DPLUGINDIR=\"$(plugindir)\" \
          -DRCDIR=\"$(rcdir)\" \
@@ -14,19 +16,19 @@ CPPFLAGS=$(X_CFLAGS) $(XFT_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) \
          -DBINARY=\"$(binary)\"
 
 INCLUDES=-I..
-LIBS=$(X_LIBS) $(XFT_LIBS) $(XINERAMA_LIBS) $(XKB_LIBS) $(XRANDR_LIBS) \
-	$(VIDMODE_LIBS) $(XSHAPE_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) \
-	$(LIBSN_LIBS) $(XML_LIBS) @LIBS@ @LIBINTL@
+LIBS=$(X_LIBS) $(SM_LIBS) $(XFT_LIBS) $(XINERAMA_LIBS) $(XKB_LIBS) \
+	$(XRANDR_LIBS) $(VIDMODE_LIBS) $(XSHAPE_LIBS) $(GLIB_LIBS) \
+	$(GMODULE_LIBS) $(LIBSN_LIBS) $(XML_LIBS) @LIBS@ @LIBINTL@
 
 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 \
@@ -34,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: