change obrender-3.0 and obparser-3.0 to 3.4 because we broke backward compatibility

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 16fef2b9b71e9aa13d7cc7967fd678ae55305ca3..4562024aced745856d227d1fa4b4c356dbe377c8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -351,8 +351,8 @@ nodist_pubinclude_HEADERS = \
        version.h
 
 nodist_pkgconfig_DATA = \
-       render/obrender-3.0.pc \
-       parser/obparser-3.0.pc
+       render/obrender-3.4.pc \
+       parser/obparser-3.4.pc
 
 ## data ##
 
@@ -414,25 +414,15 @@ data/xsession/openbox-session: \
        @$(edit) $< >$@
        @chmod a+x $@
 
-doc/openbox.1: $(srcdir)/doc/openbox.1.sgml
+%.1.in: %.1.sgml
        @echo make: creating $@
        @mkdir doc 2>/dev/null || true
-       @$(edit) $< | docbook-to-man - >$@
+       @docbook-to-man $< >$@
 
-doc/openbox-session.1: $(srcdir)/doc/openbox-session.1.sgml
+%.1: %.1.in
        @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,11 +444,15 @@ 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 \
-       render/obrender-3.0.pc.in \
-       parser/obparser-3.0.pc.in \
+       doc/openbox-kde-session.1.in \
+       render/obrender-3.4.pc.in \
+       parser/obparser-3.4.pc.in \
        tools/themeupdate/themeupdate.py \
        tests/hideshow.py \
        tests/Makefile \