make the generated files with paths depend on the Makefile, and clean them when you run make clean

5 files changed, 23 insertions, 48 deletions

diff --git a/Makefile.am b/Makefile.am
index 49719143..e68714b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -375,59 +375,24 @@ 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) $< >$@
-
-data/xsession/openbox-kde.desktop: \
-		$(srcdir)/data/xsession/openbox-kde.desktop.in
-	@echo make: creating $@
-	@mkdir data 2>/dev/null || true
-	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $< >$@
-
-data/xsession/openbox.desktop: \
-		$(srcdir)/data/xsession/openbox.desktop.in
-	@echo make: creating $@
-	@mkdir data 2>/dev/null || true
-	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $< >$@
-
-data/xsession/openbox-gnome-session: \
-		$(srcdir)/data/xsession/openbox-gnome-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-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 $@
+#	@mkdir data/xsession 2>/dev/null || true
+	@$(edit) $< >$@	
 
-data/xsession/openbox-session: \
-		$(srcdir)/data/xsession/openbox-session.in
+%-session: %-session.in Makefile
 	@echo make: creating $@
-	@mkdir data 2>/dev/null || true
-	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $< >$@
-	@chmod a+x $@
+#	@mkdir data/xsession 2>/dev/null || true
+	@$(edit) $< >$@	
 
 %.1.in: %.1.sgml
 	@echo make: creating $@
-	@mkdir doc 2>/dev/null || true
+#	@mkdir doc 2>/dev/null || true
 	@docbook-to-man $< >$@
 
-%.1: %.1.in
+%.1: %.1.in Makefile
 	@echo make: creating $@
-	@mkdir doc 2>/dev/null || true
+#	@mkdir doc 2>/dev/null || true
 	@$(edit) $< >$@	
 
 dist_gnomewmfiles_DATA = \
@@ -507,6 +472,16 @@ EXTRA_DIST = \
 	config.rpath \
 	mkinstalldirs
 
+# make clean doesn't delete these for some reason, even though they are
+# built by make
+CLEANFILES = \
+	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
 
diff --git a/doc/openbox-gnome-session.1.in b/doc/openbox-gnome-session.1.in
index 59f10de6..a1e0b471 100644
--- a/doc/openbox-gnome-session.1.in
+++ b/doc/openbox-gnome-session.1.in
@@ -16,4 +16,4 @@ The program's full documentation is available on the website:
 .PP 
 Please report bugs to: \fBhttp://bugzilla.icculus.org/ 
 \fP 
-.\" created by instant / docbook-to-man, Mon 21 May 2007, 23:11 
+.\" created by instant / docbook-to-man, Tue 22 May 2007, 00:06 
diff --git a/doc/openbox-kde-session.1.in b/doc/openbox-kde-session.1.in
index d4c7f142..2c21e0b6 100644
--- a/doc/openbox-kde-session.1.in
+++ b/doc/openbox-kde-session.1.in
@@ -16,4 +16,4 @@ The program's full documentation is available on the website:
 .PP 
 Please report bugs to: \fBhttp://bugzilla.icculus.org/ 
 \fP 
-.\" created by instant / docbook-to-man, Mon 21 May 2007, 23:11 
+.\" created by instant / docbook-to-man, Tue 22 May 2007, 00:06 
diff --git a/doc/openbox-session.1.in b/doc/openbox-session.1.in
index 1ce7e863..2d242f93 100644
--- a/doc/openbox-session.1.in
+++ b/doc/openbox-session.1.in
@@ -36,4 +36,4 @@ The program's full documentation is available on the website:
 .PP 
 Please report bugs to: \fBhttp://bugzilla.icculus.org/ 
 \fP 
-.\" created by instant / docbook-to-man, Mon 21 May 2007, 23:11 
+.\" created by instant / docbook-to-man, Tue 22 May 2007, 00:06 
diff --git a/doc/openbox.1.in b/doc/openbox.1.in
index c674cdbf..2a5446f3 100644
--- a/doc/openbox.1.in
+++ b/doc/openbox.1.in
@@ -92,4 +92,4 @@ The program's full documentation is available on the website:
 .PP 
 Please report bugs to: \fBhttp://bugzilla.icculus.org/ 
 \fP 
-.\" created by instant / docbook-to-man, Mon 21 May 2007, 23:10 
+.\" created by instant / docbook-to-man, Tue 22 May 2007, 00:06