X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2FMakefile.am;h=0b1fec9a9d0a22637ee742c1ba050f22f438cbc8;hb=373a4584d603a4dc14c64d5f27653c83a1fe686b;hp=2503354ff719dae836cc98e8ac9fb02d18524b77;hpb=67bbd6970ce0b807397e5ecb3255982d7b1cc617;p=chaz%2Fopenbox

diff --git a/openbox/Makefile.am b/openbox/Makefile.am
index 2503354f..0b1fec9a 100644
--- a/openbox/Makefile.am
+++ b/openbox/Makefile.am
@@ -1,54 +1,41 @@
 localedir=$(datadir)/locale
-enginedir=$(libdir)/openbox/engines
-plugindir=$(libdir)/openbox/plugins
 rcdir=$(datadir)/openbox
+plugindir=$(libdir)/openbox/plugins
 
 binary=openbox3
-url=http://icculus.org/openbox
-bugurl=http://bugzilla.icculus.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)\"
-
-LIBS=$(XFT_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) @LIBS@
+url=http://openbox.org/
+
+CPPFLAGS=$(X_CFLAGS) $(SM_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)\"
+
+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) @LIBS@ @LIBINTL@
 
 bin_PROGRAMS=$(binary)
 
-openbox3_LDADD=@LIBINTL@ ../render/librender.a
+openbox3_LDADD=-lobrender -L../render -lobparser -L../parser
 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 \
-	y.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 \
-	y.tab.h
-
-lex.yy.c: parse.l
-	$(FLEX) $^
-
-parse.h: y.tab.h
-
-y.tab.h: y.tab.c
-
-y.tab.c: parse.y
-	$(YACC) -d $<
-
-MAINTAINERCLEANFILES= Makefile.in
-
-clean-local:
-	$(RM) y.tab.c y.tab.h lex.yy.c
+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
+
+MAINTAINERCLEANFILES=Makefile.in
 
 distclean-local:
 	$(RM) *\~ *.orig *.rej .\#*