Makefile: stop exporting so many environment variables

This export business is annoying while testing e2factory during
development . It's also difficult to reason about the origin of a
variable value, since they show up by including make.vars as well as
being inherited through the environment. The only obvious user has been
converted (GENSCRIPT)

Signed-off-by: Tobias Ulmer <tu@emlix.com>

diff --git a/make.vars b/make.vars
index 026f59211696c4b0cd5980ff3bebab73c481a7a4..6d40fe38703292c64764dc1f6dc3ce3cb60b6085 100644 (file)
--- a/make.vars
+++ b/make.vars
@@ -34,13 +34,11 @@ GLOBAL_INTERFACE_VERSION = 2
 # when creating a project a current set of local tools is requested
 DEFAULT_LOCAL_BRANCH = master
 DEFAULT_LOCAL_TAG = $(TAG)
-export DEFAULT_LOCAL_BRANCH DEFAULT_LOCAL_TAG
 
 DETECT_TOOL = $(TOPLEVEL)/scripts/detect_tool
 
 PROJECTDIR ?= $(shell cd $(TOPLEVEL) && $(BINDIR)/e2-locate-project-root 2>/dev/null)
 E2DATA = /mnt/e2data
-export E2DATA PROJECTDIR
 
 DESTDIR =
 PREFIX = /usr/local
@@ -54,8 +52,6 @@ SYSCONFDIR = /etc/e2
 MANDIR = $(SHAREDIR)/man
 DOCDIR = $(SHAREDIR)/doc/e2
 TOOLDIR = $(LIBEXECDIR)/tools
-export PREFIX BINDIR LIBDIR INCDIR MANDIR TOOLDIR LIBEXECDIR LOCALSTATEDIR
-export SYSCONFDIR
 
 LOCALPREFIX = $(PROJECTDIR)/.e2
 LOCALBINDIR = $(LOCALPREFIX)/bin
@@ -63,7 +59,6 @@ LOCALLIBDIR = $(LOCALPREFIX)/lib/e2
 LOCALMAKDIR = $(LOCALPREFIX)/lib/make
 LOCALPLUGINDIR = $(LOCALPREFIX)/plugins
 LOCALDOCDIR = $(LOCALPREFIX)/doc
-export LOCALPREFIX LOCALBINDIR LOCALLIBDIR LOCALMAKDIR LOCALPLUGINDIR LOCALDOCDIR
 
 ARCH             = $(shell uname -m)
 LUA_VERSION       = 5.1.3
@@ -79,8 +74,6 @@ BASE_PROJECT_PATH = $(E2DATA)/projects/emlix/emlix-base-project/proj/emlix-base-
 BINARY_STORE      = $(E2DATA)/projects/emlix/e2/files
 LUA_SOURCE_PATH   ?= $(TOPLEVEL)
 
-export LUA_VERSION UPSTREAM BASE_PROJECT_PATH LUAC BUILD_LUAC ARCH BINARY_STORE
-
 CC       = gcc
 CFLAGS   = -g -Wall
 CPPFLAGS = \
@@ -94,15 +87,12 @@ CPPFLAGS = \
 
 LDFLAGS  =
 
-export CC CFLAGS CPPFLAGS LDFLAGS
-
 # build-time detection for tools used by the setuid root code
 ENV_TOOL    = $(shell $(DETECT_TOOL) env)
 CHROOT_TOOL = $(shell $(DETECT_TOOL) chroot)
 TAR_TOOL    = $(shell $(DETECT_TOOL) tar)
 CHOWN_TOOL  = $(shell $(DETECT_TOOL) chown)
 RM_TOOL     = $(shell $(DETECT_TOOL) rm)
-export ENV_TOOL TAR_TOOL CHROOT_TOOL TAR_TOOL CHOWN_TOOL RM_TOOL
 
 E2_SU_CFLAGS = -D CHROOT_TOOL="\"$(CHROOT_TOOL)\""     \
                -D TAR_TOOL="\"$(TAR_TOOL)\""           \
@@ -110,7 +100,6 @@ E2_SU_CFLAGS =      -D CHROOT_TOOL="\"$(CHROOT_TOOL)\""     \
                -D RM_TOOL="\"$(RM_TOOL)\""
 
 E2_GROUP = ebs
-export E2_GROUP
 
 GENSCRIPT = env PREFIX=$(PREFIX) BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) \
            LIBEXECDIR=$(LIBEXECDIR) LOCALSTATEDIR=$(LOCALSTATEDIR) \