X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=8f4c14e2018e81a0c57f04cfb917ef5526fa225c;hb=47529e777f5d0ac222b6ed06c9644c3909bd6479;hp=553fcb923914bf5dd950459482f797678b80fcfc;hpb=3bee91aaf9c9893fb4a516432ad195a117baf1ce;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 553fcb92..8f4c14e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,8 @@ bin_PROGRAMS = \
 	openbox/openbox \
 	tools/gnome-panel-control/gnome-panel-control
 
-bin_SCRIPTS = \
+nodist_bin_SCRIPTS = \
+	data/xsession/openbox-session \
 	data/xsession/openbox-gnome-session \
 	data/xsession/openbox-kde-session
 
@@ -42,6 +43,7 @@ noinst_PROGRAMS = \
 
 render_rendertest_CPPFLAGS = \
 	$(PANGO_CFLAGS) \
+	$(XFT_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\"RenderTest\"
 render_rendertest_LDADD = \
@@ -49,6 +51,7 @@ render_rendertest_LDADD = \
 	render/libobrender.la \
 	$(GLIB_LIBS) \
 	$(PANGO_LIBS) \
+	$(XFT_LIBS) \
 	$(XML_LIBS) \
 	$(X_LIBS)
 render_rendertest_SOURCES = render/test.c
@@ -58,6 +61,7 @@ render_libobrender_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(XML_CFLAGS) \
 	$(PANGO_CFLAGS) \
+	$(XFT_CFLAGS) \
 	-DG_LOG_DOMAIN=\"ObRender\" \
 	-DDEFAULT_THEME=\"$(theme)\"
 render_libobrender_la_LDFLAGS = \
@@ -66,6 +70,7 @@ render_libobrender_la_LIBADD = \
 	parser/libobparser.la \
 	$(X_LIBS) \
 	$(PANGO_LIBS) \
+	$(XFT_LIBS) \
 	$(GLIB_LIBS) \
 	$(XML_LIBS)
 render_libobrender_la_SOURCES = \
@@ -168,6 +173,12 @@ openbox_openbox_SOURCES = \
 	openbox/extensions.h \
 	openbox/focus.c \
 	openbox/focus.h \
+	openbox/focus_cycle.c \
+	openbox/focus_cycle.h \
+	openbox/focus_cycle_indicator.c \
+	openbox/focus_cycle_indicator.h \
+	openbox/focus_cycle_popup.c \
+	openbox/focus_cycle_popup.h \
 	openbox/frame.c \
 	openbox/frame.h \
 	openbox/framerender.c \
@@ -355,37 +366,35 @@ dist_pixmap_DATA = \
 	data/openbox.png
 
 dist_rc_DATA = \
+	data/autostart.sh \
 	data/rc.xml \
 	data/menu.xml
 
 edit = $(SED) \
 	-e 's!@version\@!$(VERSION)!' \
+	-e 's!@configdir\@!$(configdir)!' \
 	-e 's!@bindir\@!$(bindir)!'
 
-data/xsession/openbox-gnome-session: Makefile data \
-		$(srcdir)/data/xsession/openbox-gnome-session.in
+%.desktop: %.desktop.in Makefile
 	@echo make: creating $@
-	@rm -f $@
-	@mkdir data 2>/dev/null || true
-	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $(srcdir)/data/xsession/openbox-gnome-session.in >$@
-	@chmod +x $@
-
-data/xsession/openbox-kde-session: Makefile data \
-		$(srcdir)/data/xsession/openbox-kde-session.in
+	@$(edit) $< >$@	
+
+%-session: %-session.in Makefile
+	@echo make: creating $@
+	@$(edit) $< >$@	
+
+%.1.in: %.1.sgml
+	@echo make: creating $@
+	@docbook-to-man $< >$@
+
+%.1: %.1.in Makefile
 	@echo make: creating $@
-	@rm -f $@
-	@mkdir data 2>/dev/null || true
-	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $(srcdir)/data/xsession/openbox-kde-session.in >$@
-	@chmod +x $@
+	@$(edit) $< >$@	
 
 dist_gnomewmfiles_DATA = \
-	data/gnome-wm-properties/openbox.desktop \
-	data/gnome-wm-properties/openbox-gnome.desktop \
-	data/gnome-wm-properties/openbox-kde.desktop
+	data/gnome-wm-properties/openbox.desktop
 
-dist_xsessions_DATA = \
+nodist_xsessions_DATA = \
 	data/xsession/openbox.desktop \
 	data/xsession/openbox-gnome.desktop \
 	data/xsession/openbox-kde.desktop
@@ -395,8 +404,20 @@ dist_noinst_DATA = \
 	data/rc.xsd \
 	data/menu.xsd \
 	data/themerc.xsd \
+	data/xsession/openbox.desktop.in \
+	data/xsession/openbox-gnome.desktop.in \
+	data/xsession/openbox-kde.desktop.in \
+	data/xsession/openbox-session.in \
 	data/xsession/openbox-gnome-session.in \
 	data/xsession/openbox-kde-session.in \
+	doc/openbox.1.sgml \
+	doc/openbox.1.in \
+	doc/openbox-session.1.sgml \
+	doc/openbox-session.1.in \
+	doc/openbox-gnome-session.1.sgml \
+	doc/openbox-gnome-session.1.in \
+	doc/openbox-kde-session.1.sgml \
+	doc/openbox-kde-session.1.in \
 	render/obrender-3.0.pc.in \
 	parser/obparser-3.0.pc.in \
 	tools/themeupdate/themeupdate.py \
@@ -420,13 +441,46 @@ dist_noinst_DATA = \
 dist_doc_DATA = \
 	COMPLIANCE \
 	README \
-	AUTHORS
+	AUTHORS \
+	CHANGELOG \
+	COPYING \
+	data/rc.xsd \
+	data/menu.xsd \
+	data/themerc.xsd \
+	doc/rc-mouse-focus.xml
+
+nodist_man_MANS = \
+	doc/openbox.1 \
+	doc/openbox-session.1 \
+	doc/openbox-gnome-session.1 \
+	doc/openbox-kde-session.1
 
 EXTRA_DIST = \
+	debian/changelog.in \
+	debian/compat \
+	debian/conffiles \
+	debian/control \
+	debian/copyright \
+	debian/menu \
+	debian/postinst \
+	debian/postrm \
+	debian/rules \
 	config.rpath \
-	mkinstalldirs \
-	CHANGELOG \
-	COPYING
+	mkinstalldirs
+
+# make clean doesn't delete these for some reason, even though they are
+# built by make
+CLEANFILES = \
+	doc/openbox.1 \
+	doc/openbox-session.1 \
+	doc/openbox-gnome-session.1 \
+	doc/openbox-kde-session.1 \
+	data/xsession/openbox-session \
+	data/xsession/openbox-gnome-session \
+	data/xsession/openbox-kde-session \
+	data/xsession/openbox.desktop \
+	data/xsession/openbox-gnome.desktop \
+	data/xsession/openbox-kde.desktop
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc