Merge branch 'maint'

[paraslash.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index b156d1a7efb0d3d3def4e562767cfc4c51b15142..f184546b8ea22776a91f502a1c49f321b1fecbf7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,6 +59,7 @@ CPPFLAGS += @arch_cppflags@
 CPPFLAGS += -I/usr/local/include
 CPPFLAGS += -I$(cmdline_dir)
 CPPFLAGS += @osl_cppflags@
+CPPFLAGS += -DGIT_VERSION='"$(GIT_VERSION)"'
 
 BINARIES = para_server para_client para_audioc para_recv \
        para_filter para_write para_afh @extra_binaries@
@@ -84,11 +85,17 @@ tarball_delete := $(addprefix $(tarball_pfx)/,\
        $(ggo_dir) skencil)
 tarball := @PACKAGE_TARNAME@-$(PACKAGE_VERSION).tar.bz2
 
-.PHONY: all clean distclean maintainer-clean install man tarball
+.PHONY: all clean distclean maintainer-clean install man tarball\
+       .FORCE-GIT-VERSION-FILE
 all: $(BINARIES) $(man_pages)
 man: $(man_pages)
 tarball: $(tarball)
 
+GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
+       @./GIT-VERSION-GEN GIT-VERSION-FILE
+-include GIT-VERSION-FILE
+$(BINARIES): GIT-VERSION-FILE
+
 -include $(ggo_dir)/makefile
 
 %_command_list.c: %.cmd
@@ -202,19 +209,22 @@ para_afh: $(afh_objs)
        $(CC) $(LDFLAGS) -o $@ $(afh_objs) @afh_ldflags@
 
 clean:
-       rm -f $(BINARIES)
-       rm -f *_command_list.*
+       rm -f $(BINARIES) $(object_dir)/*.o
+
+clean2: clean
        rm -rf man $(object_dir)
-distclean: clean
+       rm -f *_command_list.*
+
+distclean: clean2
        rm -f Makefile autoscan.log config.status config.log && \
-       rm -rf cmdline autom4te.cache aclocal.m4
+       rm -rf autom4te.cache aclocal.m4
        rm -f GPATH GRTAGS GSYMS GTAGS
 
 maintainer-clean: distclean
        rm -f $(ggo_generated) *.tar.bz2 \
                config.h configure \
                config.h.in skencil/*.pdf skencil/*.ps
-       rm -rf web_sync
+       rm -rf web_sync $(cmdline_dir)
 
 install: all man
        mkdir -p $(BINDIR) $(MANDIR)
@@ -227,6 +237,7 @@ $(tarball): $(cmdline_generated)
        git archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
                | tar --delete $(tarball_delete) > $(tarball_pfx).tar
        mkdir -p $(tarball_pfx)/$(cmdline_dir)
+       echo $(GIT_VERSION) > $(tarball_pfx)/VERSION
        cp -r $(autocrap) $(tarball_pfx)
        cp -r $(cmdline_generated) $(tarball_pfx)/$(cmdline_dir)
        tar rf $(tarball_pfx).tar $(tarball_pfx)/*