fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 17:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

automake: rework the git_sha1.h rule, include in tarball

Browse source 
As we'll need the file in the release tarball, rework the rule so that
the file is regenerated _only_ if we're in a git repository.

With this in place we can build vulkan (anv) from a release tarball.

Cc: Jason Ekstrand <jason.ekstrand@intel.com>
Cc: Kristian Høgsberg Kristensen <krh@bitplanet.net>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Emil Velikov 2016-05-30 12:32:05 +01:00 • committed by Emil Velikov
parent 4cd9cd6abc
commit 3689ef32af
2 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -49,4 +49,3 @@ Makefile.in
.install-mesa-links .install-mesa-links
.install-gallium-links .install-gallium-links
/src/git_sha1.h /src/git_sha1.h
/src/git_sha1.h.tmp

20
src/Makefile.am
View file

@ -19,30 +19,16 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE. # IN THE SOFTWARE.
.PHONY: git_sha1.h.tmp git_sha1.h:
git_sha1.h.tmp:
@# Don't assume that $(top_srcdir)/.git is a directory. It may be
@# a gitlink file if $(top_srcdir) is a submodule checkout or a linked
@# worktree.
@touch git_sha1.h.tmp
@if test -e $(top_srcdir)/.git; then \ @if test -e $(top_srcdir)/.git; then \
if which git > /dev/null; then \ if which git > /dev/null; then \
git --git-dir=$(top_srcdir)/.git log -n 1 --oneline | \ git --git-dir=$(top_srcdir)/.git log -n 1 --oneline | \
sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/' \ sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/' \
> git_sha1.h.tmp ; \ > git_sha1.h ; \
fi \ fi \
fi fi
git_sha1.h: git_sha1.h.tmp
@echo "updating git_sha1.h"
@if ! cmp -s git_sha1.h.tmp git_sha1.h; then \
mv git_sha1.h.tmp git_sha1.h ;\
else \
rm git_sha1.h.tmp ;\
fi
BUILT_SOURCES = git_sha1.h BUILT_SOURCES = git_sha1.h
CLEANFILES = $(BUILT_SOURCES)
SUBDIRS = . gtest util mapi/glapi/gen mapi SUBDIRS = . gtest util mapi/glapi/gen mapi
@ -92,7 +78,7 @@ SUBDIRS += gallium
endif endif
EXTRA_DIST = \ EXTRA_DIST = \
getopt hgl SConscript getopt hgl SConscript git_sha1.h
AM_CFLAGS = $(VISIBILITY_CFLAGS) AM_CFLAGS = $(VISIBILITY_CFLAGS)
AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)