all my changes while i was offline.

[chaz/openbox] / openbox / Makefile.am

diff --git a/openbox/Makefile.am b/openbox/Makefile.am
index a82473b55a4c58c440770c9056536e968a09a62d..8e027ddb8882a3f30d85b2263dbde48c2aff88c7 100644 (file)
--- a/openbox/Makefile.am
+++ b/openbox/Makefile.am
@@ -14,22 +14,24 @@ 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) @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 \
                  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
+                 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
+               stacking.h timer.h xerror.h moveresize.h startup.h popup.h
 
 # kill the implicit .c.y rule
 %.c: %.y