X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2FMakefile.am;h=fc9f4ae3ec90fa1d55c019eb8b0030c999f7b30e;hb=07539c38c8392e5ce5ad0912e0c4ecf7982cb07a;hp=e860580e09e1c54eb68c5e933ee75e4b914fbf82;hpb=c4a5149016c98346bae4ce594d37065bd8f3dcf0;p=chaz%2Fopenbox

diff --git a/openbox/Makefile.am b/openbox/Makefile.am
index e860580e..fc9f4ae3 100644
--- a/openbox/Makefile.am
+++ b/openbox/Makefile.am
@@ -1,53 +1,40 @@
 localedir=$(datadir)/locale
-plugindir=$(libdir)/openbox/plugins
 rcdir=$(datadir)/openbox
+plugindir=$(libdir)/openbox/plugins
 
 binary=openbox3
-url=http://icculus.org/openbox
+url=http://openbox.org/
 
 CPPFLAGS=$(X_CFLAGS) $(XFT_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) \
-          @CPPFLAGS@ \
+         $(LIBSN_CFLAGS) $(GL_CFLAGS) $(XML_CFLAGS) @CPPFLAGS@ \
          -DLOCALEDIR=\"$(localedir)\" \
-         -DRCDIR=\"$(rcdir)\" \
          -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@
+	$(VIDMODE_LIBS) $(XSHAPE_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) \
+	$(LIBSN_LIBS) $(XML_LIBS) @LIBS@ @LIBINTL@
 
 bin_PROGRAMS=$(binary)
 
-openbox3_LDADD=-lobrender -L../render
+openbox3_LDADD=-lobrender -L../render -lobparser -L../parser
 openbox3_LDFLAGS=-export-dynamic
-openbox3_SOURCES=parse.tab.c parse.lex.c action.c client.c config.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 parse.c plugin.c prop.c screen.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 slit.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 parse.h parse.tab.h plugin.h prop.h screen.h \
+               menu.h openbox.h plugin.h prop.h screen.h \
                stacking.h timer.h xerror.h moveresize.h startup.h popup.h \
-               slit.h
-
-# kill the implicit .c.y rule
-%.c: %.y
-	@
-
-%.lex.c: %.l
-	$(FLEX) -o$@ $<
-
-%.tab.c: %.y
-	$(BISON) -d -o $@ $<
+               dock.h window.h
 
 MAINTAINERCLEANFILES=Makefile.in
 
-clean-local:
-	$(RM) parse.lex.c parse.tab.c parse.tab.h
-
 distclean-local:
 	$(RM) *\~ *.orig *.rej .\#*