X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=blobdiff_plain;f=Makefile.am;h=c29e04203e11050e7b03edd1c0baa3c682c6e800;hp=7ed1f6a8d908065085632cb72342ffb10aa4ee8f;hb=2ea60e77c085a724b2ec28273e24e12ece0e84f3;hpb=3f870080de978e905f764b6cbc8e662a419d8983

diff --git a/Makefile.am b/Makefile.am
index 7ed1f6a8..c29e0420 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,19 +75,21 @@ 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.h \
 	obrender/button.c \
 	obrender/color.h \
 	obrender/color.c \
@@ -113,6 +115,7 @@ obrender_libobrender_la_SOURCES = \
 ## obt ##
 
 obt_libobt_la_CPPFLAGS = \
+	$(X_CFLAGS) \
 	$(XINERAMA_CFLAGS) \
 	$(XKB_CFLAGS) \
 	$(XRANDR_CFLAGS) \
@@ -127,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) \
@@ -283,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 \
@@ -515,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 \
@@ -585,7 +592,6 @@ EXTRA_DIST = \
 CLEANFILES = \
 	$(nodist_man_MANS) \
 	$(nodist_bin_SCRIPTS) \
-	$(dist_gnomesession_DATA) \
 	$(nodist_xsessions_DATA) \
 	$(nodist_rc_SCRIPTS) \
 	$(nodist_libexec_SCRIPTS)