X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=blobdiff_plain;f=Makefile.am;h=c29e04203e11050e7b03edd1c0baa3c682c6e800;hp=c3feae6c1989820b90fefe4462be03e4a32aa013;hb=HEAD;hpb=6624d06dd17490189764ca6c3a6c7eb8c5f55a5b

diff --git a/Makefile.am b/Makefile.am
index c3feae6c..c29e0420 100644
--- 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
@@ -74,18 +75,22 @@ obrender_libobrender_la_CPPFLAGS = \
 	$(XML_CFLAGS) \
 	$(PANGO_CFLAGS) \
 	$(IMLIB2_CFLAGS) \
+	$(LIBRSVG_CFLAGS) \
 	-DG_LOG_DOMAIN=\"ObRender\" \
 	-DDEFAULT_THEME=\"$(theme)\"
 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) \
 	$(IMLIB2_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(XML_LIBS)
 obrender_libobrender_la_SOURCES = \
 	gettext.h \
+	obrender/button.c \
 	obrender/color.h \
 	obrender/color.c \
 	obrender/font.h \
@@ -110,6 +115,7 @@ obrender_libobrender_la_SOURCES = \
 ## obt ##
 
 obt_libobt_la_CPPFLAGS = \
+	$(X_CFLAGS) \
 	$(XINERAMA_CFLAGS) \
 	$(XKB_CFLAGS) \
 	$(XRANDR_CFLAGS) \
@@ -124,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) \
@@ -170,6 +177,8 @@ openbox_openbox_CPPFLAGS = \
 	-DCONFIGDIR=\"$(configdir)\" \
 	-DG_LOG_DOMAIN=\"Openbox\"
 openbox_openbox_LDADD = \
+	$(XINERAMA_LIBS) \
+	$(XRANDR_LIBS) \
 	$(SM_LIBS) \
 	$(GLIB_LIBS) \
 	$(X_LIBS) \
@@ -278,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 \
@@ -321,9 +332,11 @@ tools_obxprop_obxprop_SOURCES = \
 ## gdm-control ##
 
 tools_gdm_control_gdm_control_CPPFLAGS = \
+	$(XAUTH_CFLAGS) \
 	$(X_CFLAGS) \
 	$(GLIB_CFLAGS)
 tools_gdm_control_gdm_control_LDADD = \
+	$(XAUTH_LIBS) \
 	$(X_LIBS) \
 	$(GLIB_LIBS)
 tools_gdm_control_gdm_control_SOURCES = \
@@ -507,6 +520,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 \