Add activedesktop to If

[dana/openbox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4f60bd0..c29e042 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,6 +75,7 @@ obrender_libobrender_la_CPPFLAGS = \
        $(XML_CFLAGS) \
        $(PANGO_CFLAGS) \
        $(IMLIB2_CFLAGS) \
+       $(LIBRSVG_CFLAGS) \
        -DG_LOG_DOMAIN=\"ObRender\" \
        -DDEFAULT_THEME=\"$(theme)\"
 obrender_libobrender_la_LDFLAGS = \
@@ -85,10 +86,10 @@ obrender_libobrender_la_LIBADD = \
        $(PANGO_LIBS) \
        $(GLIB_LIBS) \
        $(IMLIB2_LIBS) \
+       $(LIBRSVG_LIBS) \
        $(XML_LIBS)
 obrender_libobrender_la_SOURCES = \
        gettext.h \
-       obrender/button.h \
        obrender/button.c \
        obrender/color.h \
        obrender/color.c \
@@ -114,6 +115,7 @@ obrender_libobrender_la_SOURCES = \
 ## obt ##
 
 obt_libobt_la_CPPFLAGS = \
+       $(X_CFLAGS) \
        $(XINERAMA_CFLAGS) \
        $(XKB_CFLAGS) \
        $(XRANDR_CFLAGS) \
@@ -128,6 +130,7 @@ obt_libobt_la_CPPFLAGS = \
 obt_libobt_la_LDFLAGS = \
        -version-info $(OBT_CURRENT):$(OBT_REVISION):$(OBT_AGE)
 obt_libobt_la_LIBADD = \
+       $(X_LIBS) \
        $(XINERAMA_LIBS) \
        $(XKB_LIBS) \
        $(XRANDR_LIBS) \
@@ -284,6 +287,8 @@ openbox_openbox_SOURCES = \
        openbox/ping.h \
        openbox/place.c \
        openbox/place.h \
+       openbox/place_overlap.c \
+       openbox/place_overlap.h \
        openbox/prompt.c \
        openbox/prompt.h \
        openbox/popup.c \
@@ -516,7 +521,8 @@ nodist_xsessions_DATA = \
        data/xsession/openbox-kde.desktop
 
 dist_gnomesession_DATA = \
-       data/xsession/openbox-gnome.session
+       data/gnome-session/openbox-gnome.session \
+       data/gnome-session/openbox-gnome-fallback.session
 
 dist_noinst_DATA = \
        data/rc.xsd \