add --enable-gl support, and put the flags/libs in the appropriate makefiles

[chaz/openbox] / openbox / Makefile.am

diff --git a/openbox/Makefile.am b/openbox/Makefile.am
index 9d8906fd0ce7c2afc7d528b5c3fc785352782a8a..4c83005ffacfd7c03ccd1f9ff8f66ec72228e5ea 100644 (file)
--- a/openbox/Makefile.am
+++ b/openbox/Makefile.am
@@ -1,54 +1,53 @@
 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) \
+         $(LIBSN_CFLAGS) $(GL_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) \
+       $(LIBSN_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 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
+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 dock.c window.c
 
-lex.yy.c: parse.l
-       $(FLEX) $^
+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 \
+               dock.h window.h
 
-parse.h: parse.tab.h
+# kill the implicit .c.y rule
+%.c: %.y
+       @
 
-parse.tab.h:parse.tab.c
+%.lex.c: %.l
+       $(FLEX) -o$@ $<
 
-parse.tab.c: parse.y
-       $(YACC) -d $<
+%.tab.c: %.y
+       $(BISON) -d -o $@ $<
 
-MAINTAINERCLEANFILES= Makefile.in
+MAINTAINERCLEANFILES=Makefile.in
 
 clean-local:
-       $(RM) y.tab.c y.tab.h lex.yy.c
+       $(RM) parse.lex.c parse.tab.c parse.tab.h
 
 distclean-local:
        $(RM) *\~ *.orig *.rej .\#*