Remove some evil tabs

[mikachu/openbox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c62a594..f32591f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,7 @@ localedir       = $(datadir)/locale
 configdir       = $(sysconfdir)/xdg
 rcdir           = $(configdir)/openbox
 xsessionsdir    = $(datadir)/xsessions
+gnomesessiondir = $(datadir)/gnome-session/sessions
 gnomewmfilesdir = $(datadir)/gnome/wm-properties
 pkgconfigdir    = $(libdir)/pkgconfig
 obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt
@@ -79,6 +80,7 @@ obrender_libobrender_la_CPPFLAGS = \
 obrender_libobrender_la_LDFLAGS = \
        -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE)
 obrender_libobrender_la_LIBADD = \
+       obt/libobt.la \
        $(X_LIBS) \
        $(PANGO_LIBS) \
        $(GLIB_LIBS) \
@@ -112,6 +114,7 @@ obrender_libobrender_la_SOURCES = \
 ## obt ##
 
 obt_libobt_la_CPPFLAGS = \
+       $(X_CFLAGS) \
        $(XINERAMA_CFLAGS) \
        $(XKB_CFLAGS) \
        $(XRANDR_CFLAGS) \
@@ -126,6 +129,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) \
@@ -282,6 +286,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 \
@@ -513,6 +519,10 @@ nodist_xsessions_DATA = \
        data/xsession/openbox-gnome.desktop \
        data/xsession/openbox-kde.desktop
 
+dist_gnomesession_DATA = \
+       data/gnome-session/openbox-gnome.session \
+       data/gnome-session/openbox-gnome-fallback.session
+
 dist_noinst_DATA = \
        data/rc.xsd \
        data/menu.xsd \