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

diff --git a/openbox/Makefile.am b/openbox/Makefile.am
index 51cc0050..8e5144ab 100644
--- a/openbox/Makefile.am
+++ b/openbox/Makefile.am
@@ -1,54 +1,87 @@
 localedir=$(datadir)/locale
-enginedir=$(libdir)/openbox/engines
-plugindir=$(libdir)/openbox/plugins
 rcdir=$(datadir)/openbox
+plugindir=$(libdir)/openbox/plugins
+desktopfilesdir=$(datadir)/gnome/wm-properties
 
-binary=openbox3
-url=http://icculus.org/openbox
-bugurl=http://bugzilla.icculus.org
+binary=openbox
+url=http://openbox.org/
 
-CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) \
-@CPPFLAGS@ \
--DLOCALEDIR=\"$(localedir)\" \
--DRCDIR=\"$(rcdir)\" \
--DPLUGINDIR=\"$(plugindir)\" \
--DENGINEDIR=\"$(enginedir)\" \
--DDEFAULT_ENGINE=\"openbox\" \
--DG_LOG_DOMAIN=\"Openbox\" \
--DBINARY=\"$(binary)\" \
--DURL=\"$(url)\" \
--DBUGURL=\"$(bugurl)\"
+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)\"
 
-LIBS=$(XFT_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) @LIBS@
+INCLUDES=-I..
+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=@LIBINTL@ ../render/librender.a
-openbox3_LDFLAGS=-export-dynamic
-openbox3_SOURCES=client.c event.c extensions.c focus.c frame.c openbox.c \
-	prop.c screen.c stacking.c xerror.c timer.c dispatch.c \
-	engine.c plugin.c action.c grab.c config.c menu.c \
-	parse.tab.c lex.yy.c parse.c
-
-noinst_HEADERS=client.h event.h extensions.h focus.h frame.h geom.h gettext.h \
-	openbox.h prop.h screen.h stacking.h xerror.h dispatch.h \
-	timer.h engine.h plugin.h action.h grab.h config.h menu.h parse.h \
-	parse.tab.h
-
-lex.yy.c: parse.l
-	$(FLEX) $^
-
-parse.h: parse.tab.h
-
-parse.tab.h:parsey.tab.c
+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
 
-parse.tab.c: parse.y
-	$(YACC) -d $<
+desktopfiles_DATA=openbox.desktop
 
-MAINTAINERCLEANFILES= Makefile.in
+EXTRA_DIST=$(desktopfiles_DATA)
 
-clean-local:
-	$(RM) y.tab.c y.tab.h lex.yy.c
+MAINTAINERCLEANFILES=Makefile.in
 
 distclean-local:
 	$(RM) *\~ *.orig *.rej .\#*