X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2FMakefile.am;h=8e027ddb8882a3f30d85b2263dbde48c2aff88c7;hb=f26f23de50cb7941a7702198e3b4d1b2f9de062e;hp=f5b67f5007d50d9d5bd0d71c0d2f9a1d8996c940;hpb=37a9456f87b6c4efd00b273f0ca2cbd8416fc5d0;p=chaz%2Fopenbox

diff --git a/openbox/Makefile.am b/openbox/Makefile.am
index f5b67f50..8e027ddb 100644
--- a/openbox/Makefile.am
+++ b/openbox/Makefile.am
@@ -1,42 +1,52 @@
 localedir=$(datadir)/locale
-enginedir=$(libdir)/openbox/engines
 plugindir=$(libdir)/openbox/plugins
 rcdir=$(datadir)/openbox
 
 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@
+
+CPPFLAGS=$(X_CFLAGS) $(XFT_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) \
+          @CPPFLAGS@ \
+         -DLOCALEDIR=\"$(localedir)\" \
+         -DRCDIR=\"$(rcdir)\" \
+         -DPLUGINDIR=\"$(plugindir)\" \
+         -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@
 
 bin_PROGRAMS=$(binary)
 
-openbox3_LDADD=@LIBINTL@ ../render/librender.a
+openbox3_LDADD=-lobrender -L../render
 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 lex.cparse.c config.c
+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
+
+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
+
+# kill the implicit .c.y rule
+%.c: %.y
+	@
+
+%.lex.c: %.l
+	$(FLEX) -o$@ $<
 
-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
+%.tab.c: %.y
+	$(BISON) -d -o $@ $<
 
-lex.cparse.c: cparse.l
-	$(FLEX) -Pcparse $^
+MAINTAINERCLEANFILES=Makefile.in
 
-MAINTAINERCLEANFILES= Makefile.in
+clean-local:
+	$(RM) parse.lex.c parse.tab.c parse.tab.h
 
 distclean-local:
 	$(RM) *\~ *.orig *.rej .\#*