X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2FMakefile.am;h=8e5144ab864301d947e69af0ece28732ef7ff464;hb=425b1734c9c195dfa0717627780072f24b5def56;hp=fc9f4ae3ec90fa1d55c019eb8b0030c999f7b30e;hpb=d1e355de2c6aae38cea3cdc0e0b902ea2b194e86;p=chaz%2Fopenbox

diff --git a/openbox/Makefile.am b/openbox/Makefile.am
index fc9f4ae3..8e5144ab 100644
--- a/openbox/Makefile.am
+++ b/openbox/Makefile.am
@@ -1,38 +1,85 @@
 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@ \
-         -DLOCALEDIR=\"$(localedir)\" \
-         -DPLUGINDIR=\"$(plugindir)\" \
-         -DRCDIR=\"$(rcdir)\" \
-         -DG_LOG_DOMAIN=\"Openbox\" \
-         -DBINARY=\"$(binary)\"
+AM_CPPFLAGS=$(X_CFLAGS) $(SM_CFLAGS) $(XFT_CFLAGS) $(GLIB_CFLAGS) \
+            $(GMODULE_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) $(XML_CFLAGS) \
+            -DLOCALEDIR=\"$(localedir)\" \
+            -DPLUGINDIR=\"$(plugindir)\" \
+            -DRCDIR=\"$(rcdir)\" \
+            -DG_LOG_DOMAIN=\"Openbox\" \
+            -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) $(EFENCE_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
-
-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 \
-               menu.h openbox.h plugin.h prop.h screen.h \
-               stacking.h timer.h xerror.h moveresize.h startup.h popup.h \
-               dock.h window.h
+openbox_LDADD=-lobrender -L../render -lobparser -L../parser
+openbox_LDFLAGS=-export-dynamic
+openbox_SOURCES=\
+  action.h \
+  action.c \
+  client.h \
+  client.c \
+  config.h \
+  config.c \
+  extensions.h \
+  extensions.c \
+  focus.h \
+  focus.c \
+  frame.h \
+  frame.c \
+  grab.h \
+  grab.c \
+  menu.h \
+  menu.c \
+  menu_render.c \
+  openbox.h \
+  openbox.c \
+  framerender.h \
+  framerender.c \
+  plugin.h \
+  plugin.c \
+  prop.h \
+  prop.c \
+  screen.h \
+  screen.c \
+  stacking.h \
+  stacking.c \
+  dispatch.h \
+  dispatch.c \
+  event.h \
+  event.c \
+  group.h \
+  group.c \
+  timer.h \
+  timer.c \
+  xerror.h \
+  xerror.c \
+  moveresize.h \
+  moveresize.c \
+  startup.h \
+  startup.c \
+  popup.h \
+  popup.c \
+  dock.h \
+  dock.c \
+  window.h \
+  window.c \
+  gettext.h \
+  geom.h
+
+desktopfiles_DATA=openbox.desktop
+
+EXTRA_DIST=$(desktopfiles_DATA)
 
 MAINTAINERCLEANFILES=Makefile.in