X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=8f4c14e2018e81a0c57f04cfb917ef5526fa225c;hb=ca342aa767d35fe40e710c116d539b9577caa6ae;hp=c4cd977371f4dd10e1b7479d00ee4a46ffa98365;hpb=0951fbeea5669d3ee3d88fdbacba4ac1dff6acfb;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index c4cd9773..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
 
@@ -172,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 \
@@ -359,74 +366,58 @@ 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!@confdir\@!$(confdir)!' \
+	-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 $@
-	@mkdir data 2>/dev/null || true
-	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $(srcdir)/data/xsession/openbox-gnome-session.in >$@
-	@chmod a+x $@
+	@$(edit) $< >$@	
 
-data/xsession/openbox-kde-session: Makefile data \
-		$(srcdir)/data/xsession/openbox-kde-session.in
+%-session: %-session.in Makefile
 	@echo make: creating $@
-	@mkdir data 2>/dev/null || true
-	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $(srcdir)/data/xsession/openbox-kde-session.in >$@
-	@chmod a+x $@
+	@$(edit) $< >$@	
 
-doc/openbox.1.in: Makefile doc $(srcdir)/doc/openbox.1.sgml
+%.1.in: %.1.sgml
 	@echo make: creating $@
-	@mkdir doc 2>/dev/null || true
-	docbook-to-man $(srcdir)/doc/openbox.1.sgml > $@
+	@docbook-to-man $< >$@
 
-doc/openbox.1: Makefile doc doc/openbox.1.in
+%.1: %.1.in Makefile
 	@echo make: creating $@
-	@mkdir doc 2>/dev/null || true
-	@$(edit) $(srcdir)/doc/openbox.1.in >$@
-
-doc/openbox-gnome-session.1: Makefile doc doc/openbox-gnome-session.1.sgml
-	@echo make: creating $@
-	@mkdir doc 2>/dev/null || true
-	docbook-to-man $(srcdir)/doc/openbox-gnome-session.1.sgml > $@
-
-doc/openbox-kde-session.1: Makefile doc doc/openbox-kde-session.1.sgml
-	@echo make: creating $@
-	@mkdir doc 2>/dev/null || true
-	docbook-to-man $(srcdir)/doc/openbox-kde-session.1.sgml > $@
+	@$(edit) $< >$@	
 
 dist_gnomewmfiles_DATA = \
 	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
 
 dist_noinst_DATA = \
-	debian/changelog.in \
-	debian/compat \
-	debian/conffiles \
-	debian/control \
-	debian/copyright \
-	debian/menu \
-	debian/postinst \
-	debian/postrm \
-	debian/rules \
 	version.h.in \
 	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 \
@@ -451,20 +442,45 @@ dist_doc_DATA = \
 	COMPLIANCE \
 	README \
 	AUTHORS \
+	CHANGELOG \
+	COPYING \
 	data/rc.xsd \
 	data/menu.xsd \
-	data/themerc.xsd
+	data/themerc.xsd \
+	doc/rc-mouse-focus.xml
 
-man_MANS = \
+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