X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2FMakefile.am;h=8e5144ab864301d947e69af0ece28732ef7ff464;hb=dd80df31c4ed096e79b45661d62e369df653f76b;hp=f33b65d2c8ad785776b72fde1ee5252cb24c139e;hpb=58cfbb7f8419e084af6b6b8b00c88ed270c29e88;p=chaz%2Fopenbox

diff --git a/openbox/Makefile.am b/openbox/Makefile.am
index f33b65d2..8e5144ab 100644
--- a/openbox/Makefile.am
+++ b/openbox/Makefile.am
@@ -1,53 +1,87 @@
 localedir=$(datadir)/locale
-plugindir=$(libdir)/openbox/plugins
 rcdir=$(datadir)/openbox
+plugindir=$(libdir)/openbox/plugins
+desktopfilesdir=$(datadir)/gnome/wm-properties
 
-binary=openbox3
-url=http://icculus.org/openbox
+binary=openbox
+url=http://openbox.org/
 
-CPPFLAGS=$(X_CFLAGS) $(XFT_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) \
-          @CPPFLAGS@ \
-         -DLOCALEDIR=\"$(localedir)\" \
-         -DRCDIR=\"$(rcdir)\" \
-         -DPLUGINDIR=\"$(plugindir)\" \
-         -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) @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
-openbox3_LDFLAGS=-export-dynamic
-openbox3_SOURCES=parse.tab.c parse.lex.c action.c client.c config.c \
-                 extensions.c focus.c frame.c grab.c menu.c menu_render.c \
-                 openbox.c framerender.c parse.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 slit.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 parse.h parse.tab.h plugin.h prop.h screen.h \
-               stacking.h timer.h xerror.h moveresize.h startup.h popup.h \
-               slit.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
 
-# kill the implicit .c.y rule
-%.c: %.y
-	@
+desktopfiles_DATA=openbox.desktop
 
-%.lex.c: %.l
-	$(FLEX) -o$@ $<
-
-%.tab.c: %.y
-	$(BISON) -d -o $@ $<
+EXTRA_DIST=$(desktopfiles_DATA)
 
 MAINTAINERCLEANFILES=Makefile.in
 
-clean-local:
-	$(RM) parse.lex.c parse.tab.c parse.tab.h
-
 distclean-local:
 	$(RM) *\~ *.orig *.rej .\#*