gallium/util: fix resource leak

[mesa.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 0527a315955412307145145d62bc5ae58ab2327c..d4e34b47bee12dc6900703be9a2156d855aa0c1f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,15 +25,13 @@ git_sha1.h.tmp:
        @# a gitlink file if $(top_srcdir) is a submodule checkout or a linked
        @# worktree.
        @# If we are building from a release tarball copy the bundled header.
+       @touch git_sha1.h.tmp
        @if test -e $(top_srcdir)/.git; then \
                if which git > /dev/null; then \
                    git --git-dir=$(top_srcdir)/.git log -n 1 --oneline | \
                        sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/' \
                        > git_sha1.h.tmp ; \
                fi \
-       else \
-               cp $(srcdir)/git_sha1.h git_sha1.h.tmp ;\
-               chmod u+w git_sha1.h.tmp; \
        fi
 
 git_sha1.h: git_sha1.h.tmp
@@ -45,12 +43,7 @@ git_sha1.h: git_sha1.h.tmp
        fi
 
 BUILT_SOURCES = git_sha1.h
-
-# We want to keep the srcdir file since we need it on rebuild from tarball.
-# At the same time `make distclean' gets angry at us if we don't cleanup the
-# builddir one.
-distclean-local:
-       test $(top_srcdir) != $(top_builddir) && rm $(builddir)/git_sha1.h
+CLEANFILES = $(BUILT_SOURCES)
 
 SUBDIRS = . gtest util mapi/glapi/gen mapi
 
@@ -100,7 +93,7 @@ SUBDIRS += gallium
 endif
 
 EXTRA_DIST = \
-       getopt hgl SConscript git_sha1.h
+       getopt hgl SConscript
 
 AM_CFLAGS = $(VISIBILITY_CFLAGS)
 AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
@@ -114,6 +107,7 @@ AM_CPPFLAGS = \
 noinst_LTLIBRARIES = libglsl_util.la
 
 libglsl_util_la_SOURCES = \
+       mesa/main/extensions_table.c \
        mesa/main/imports.c \
        mesa/program/prog_hash_table.c \
        mesa/program/symbol_table.c \