X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2FMakefile.am;h=ecb72969bd0438a6774c7ef110cf39b9cf9ae05d;hb=d2857b11944146e2e6973b7f7280cb57e1ee260b;hp=a82473b55a4c58c440770c9056536e968a09a62d;hpb=d3c094357d06f4e65681e7ca7e227a33ebd122a4;p=chaz%2Fopenbox

diff --git a/openbox/Makefile.am b/openbox/Makefile.am
index a82473b5..ecb72969 100644
--- a/openbox/Makefile.am
+++ b/openbox/Makefile.am
@@ -6,7 +6,7 @@ binary=openbox3
 url=http://icculus.org/openbox
 
 CPPFLAGS=$(X_CFLAGS) $(XFT_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) \
-          @CPPFLAGS@ \
+         $(LIBSN_CFLAGS) $(GL_CFLAGS) $(XML_CFLAGS) @CPPFLAGS@ \
          -DLOCALEDIR=\"$(localedir)\" \
          -DRCDIR=\"$(rcdir)\" \
          -DPLUGINDIR=\"$(plugindir)\" \
@@ -14,37 +14,27 @@ CPPFLAGS=$(X_CFLAGS) $(XFT_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) \
          -DBINARY=\"$(binary)\"
 
 INCLUDES=-I..
-LIBS=$(X_LIBS) $(XFT_LIBS) $(XINERAMA_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) @LIBS@
+LIBS=$(X_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@ -lobrender -L../render
+openbox3_LDADD=-lobrender -L../render
 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 parse.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
+                 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 \
-               stacking.h timer.h xerror.h moveresize.h startup.h
-
-# kill the implicit .c.y rule
-%.c: %.y
-	@
-
-%.lex.c: %.l
-	$(FLEX) -o$@ $<
-
-%.tab.c: %.y
-	$(BISON) -d -o $@ $<
+               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 parse.h
 
 MAINTAINERCLEANFILES=Makefile.in
 
-clean-local:
-	$(RM) parse.lex.c parse.tab.c parse.tab.h
-
 distclean-local:
 	$(RM) *\~ *.orig *.rej .\#*