i know we broke backwards compatibility but noone uses it except obconf and it still...

[mikachu/openbox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3150589..8fad996 100644 (file)
--- 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
 
@@ -359,71 +360,97 @@ dist_pixmap_DATA = \
        data/openbox.png
 
 dist_rc_DATA = \
+       data/autostart.sh \
        data/rc.xml \
        data/menu.xml
 
 edit = $(SED) \
-       -e 's!@time\@!`date`!' \
        -e 's!@version\@!$(VERSION)!' \
+       -e 's!@configdir\@!$(configdir)!' \
        -e 's!@bindir\@!$(bindir)!'
 
-data/xsession/openbox-gnome-session: Makefile data \
+data/xsession/openbox-gnome.desktop: \
+               $(srcdir)/data/xsession/openbox-gnome.desktop.in
+       @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 $@
-       @rm -f $@
        @mkdir data 2>/dev/null || true
        @mkdir data/xsession 2>/dev/null || true
-       @$(edit) $(srcdir)/data/xsession/openbox-gnome-session.in >$@
-       @chmod +x $@
+       @$(edit) $< >$@
+       @chmod a+x $@
 
-data/xsession/openbox-kde-session: Makefile data \
+data/xsession/openbox-kde-session: \
                $(srcdir)/data/xsession/openbox-kde-session.in
        @echo make: creating $@
-       @rm -f $@
        @mkdir data 2>/dev/null || true
        @mkdir data/xsession 2>/dev/null || true
-       @$(edit) $(srcdir)/data/xsession/openbox-kde-session.in >$@
-       @chmod +x $@
+       @$(edit) $< >$@
+       @chmod a+x $@
 
-debian/changelog: debian debian/changelog.in
+data/xsession/openbox-session: \
+               $(srcdir)/data/xsession/openbox-session.in
        @echo make: creating $@
-       @rm -f $@
-       @mkdir debian 2>/dev/null || true
-       @$(edit) $(srcdir)/debian/changelog.in >$@
-       @chmod +x $@
+       @mkdir data 2>/dev/null || true
+       @mkdir data/xsession 2>/dev/null || true
+       @$(edit) $< >$@
+       @chmod a+x $@
+
+%.1.in: %.1.sgml
+       @echo make: creating $@
+       @mkdir doc 2>/dev/null || true
+       @docbook-to-man $< >$@
+
+%.1: %.1.in
+       @echo make: creating $@
+       @mkdir doc 2>/dev/null || true
+       @$(edit) $< >$@ 
 
 dist_gnomewmfiles_DATA = \
-       data/gnome-wm-properties/openbox.desktop \
-       data/gnome-wm-properties/openbox-gnome.desktop \
-       data/gnome-wm-properties/openbox-kde.desktop
+       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/control
-       debian/copyright
-       debian/dirs
-       debian/docs
-       debian/menu.ex
-       debian/openbox-default.ex
-       debian/openbox.doc-base.EX
-       debian/postinst.ex
-       debian/postrm.ex
-       debian/preinst.ex
-       debian/prerm.ex
-       debian/rules
-       debian/watch.ex
        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 \
@@ -447,13 +474,32 @@ dist_noinst_DATA = \
 dist_doc_DATA = \
        COMPLIANCE \
        README \
-       AUTHORS
+       AUTHORS \
+       CHANGELOG \
+       COPYING \
+       data/rc.xsd \
+       data/menu.xsd \
+       data/themerc.xsd \
+       doc/rc-mouse-focus.xml
+
+dist_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
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc
@@ -465,8 +511,4 @@ distclean-local:
                done \
        done
 
-deb:    dist debian/changelog
-       fakeroot debian/rules binary
-#        dpkg-buildpackage -rfakeroot
-
-.PHONY: doc deb
+.PHONY: doc