X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=8f4c14e2018e81a0c57f04cfb917ef5526fa225c;hb=16fcb1213d4ccfccd4e4a8ad5e8b0c826dc5c16e;hp=16fef2b9b71e9aa13d7cc7967fd678ae55305ca3;hpb=9aa5ca29ae29b1ab26e5c0299ab161beee9680b3;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 16fef2b9..8f4c14e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -173,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 \
@@ -369,70 +375,21 @@ edit = $(SED) \
 	-e 's!@configdir\@!$(configdir)!' \
 	-e 's!@bindir\@!$(bindir)!'
 
-data/xsession/openbox-gnome.desktop: \
-		$(srcdir)/data/xsession/openbox-gnome.desktop.in
+%.desktop: %.desktop.in Makefile
 	@echo make: creating $@
-	@mkdir data 2>/dev/null || true
-	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $< >$@
+	@$(edit) $< >$@	
 
-data/xsession/openbox-kde.desktop: \
-		$(srcdir)/data/xsession/openbox-kde.desktop.in
+%-session: %-session.in Makefile
 	@echo make: creating $@
-	@mkdir data 2>/dev/null || true
-	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $< >$@
+	@$(edit) $< >$@	
 
-data/xsession/openbox.desktop: \
-		$(srcdir)/data/xsession/openbox.desktop.in
+%.1.in: %.1.sgml
 	@echo make: creating $@
-	@mkdir data 2>/dev/null || true
-	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $< >$@
+	@docbook-to-man $< >$@
 
-data/xsession/openbox-gnome-session: \
-		$(srcdir)/data/xsession/openbox-gnome-session.in
+%.1: %.1.in Makefile
 	@echo make: creating $@
-	@mkdir data 2>/dev/null || true
-	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $< >$@
-	@chmod a+x $@
-
-data/xsession/openbox-kde-session: \
-		$(srcdir)/data/xsession/openbox-kde-session.in
-	@echo make: creating $@
-	@mkdir data 2>/dev/null || true
-	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $< >$@
-	@chmod a+x $@
-
-data/xsession/openbox-session: \
-		$(srcdir)/data/xsession/openbox-session.in
-	@echo make: creating $@
-	@mkdir data 2>/dev/null || true
-	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $< >$@
-	@chmod a+x $@
-
-doc/openbox.1: $(srcdir)/doc/openbox.1.sgml
-	@echo make: creating $@
-	@mkdir doc 2>/dev/null || true
-	@$(edit) $< | docbook-to-man - >$@
-
-doc/openbox-session.1: $(srcdir)/doc/openbox-session.1.sgml
-	@echo make: creating $@
-	@mkdir doc 2>/dev/null || true
-	@$(edit) $< | docbook-to-man - >$@
-
-doc/openbox-gnome-session.1: $(srcdir)/doc/openbox-gnome-session.1.sgml
-	@echo make: creating $@
-	@mkdir doc 2>/dev/null || true
-	@$(edit) $< | docbook-to-man - >$@
-
-doc/openbox-kde-session.1: $(srcdir)/doc/openbox-kde-session.1.sgml
-	@echo make: creating $@
-	@mkdir doc 2>/dev/null || true
-	@$(edit) $< | docbook-to-man - >$@
+	@$(edit) $< >$@	
 
 dist_gnomewmfiles_DATA = \
 	data/gnome-wm-properties/openbox.desktop
@@ -454,9 +411,13 @@ dist_noinst_DATA = \
 	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 \
@@ -488,7 +449,7 @@ dist_doc_DATA = \
 	data/themerc.xsd \
 	doc/rc-mouse-focus.xml
 
-dist_man_MANS = \
+nodist_man_MANS = \
 	doc/openbox.1 \
 	doc/openbox-session.1 \
 	doc/openbox-gnome-session.1 \
@@ -507,6 +468,20 @@ EXTRA_DIST = \
 	config.rpath \
 	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