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

diff --git a/Makefile.am b/Makefile.am
index 49719143da14d18a643891da6be20c7b2a7adfb9..e68714b65a833b4f333db1634ebb07af57ed8649 100644 (file)
--- 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 59f10de6840098627d073dfdd996c2844acf400a..a1e0b4714425a7ace28941090f2358ce44fb57c7 100644 (file)
--- 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 d4c7f14227e028495648c016ff1e9ada5ef08252..2c21e0b6b02357e09ad0e39d3d00193d8a949549 100644 (file)
--- 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 1ce7e863b93b3684695f3d091bafddd4449ea58d..2d242f937c2a2f714c347db6f35c33e3ca5811bd 100644 (file)
--- 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 c674cdbf9db9b7ea81f8c483a2b2b264c98425d1..2a5446f3c21eba6b4a64645d7ea9ae270cd5d0af 100644 (file)
--- 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