Skip to content

Commit 0fd6b14

Browse files
committed
refactor(makefile): prune old variables
Prune old variables that are no longer needed. Signed-off-by: Randolph Sapp <[email protected]>
1 parent fdc5325 commit 0fd6b14

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

Makefile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,13 @@ export ROOTDIR = $(dir $(mkfile_path))
2020
$(info ROOTDIR is $(ROOTDIR))
2121

2222
$(info DEVFAMILY is $(DEVFAMILY_UP))
23-
FAMILYSETUPFILE = python-scripts/family_setup.py
2423

2524
ifeq ($(DEVFAMILY_UP), $(filter $(DEVFAMILY_UP), J721E J7200 J721S2 J784S4 AM68 AM69 J722S AM67 J742S2))
2625
CONFDIR = source/devices/J7_Family/${OS_LOW}
2726
else
2827
CONFDIR = source/devices/$(DEVFAMILY_UP)/${OS_LOW}
2928
endif
30-
TAGFILE = configs/$(DEVFAMILY_UP)/$(DEVFAMILY_UP)_${OS_LOW}_tags.py
3129

32-
$(info TAGFILE is $(TAGFILE))
3330
$(info CONFDIR is $(CONFDIR))
3431

3532
VERSION = $(shell cat ${CONFDIR}/version.txt)
@@ -44,7 +41,7 @@ endif
4441
# Internal variables.
4542
PAPEROPT_a4 = -D latex_paper_size=a4
4643
PAPEROPT_letter = -D latex_paper_size=letter
47-
CONFLOC = -c build/
44+
CONFLOC = -c $(ROOTDIR)
4845
VEROPTS = -D version=${VERSION} -D release=${VERSION}
4946
GIT_HASH = -D html_context.commit="$(shell git rev-parse --short HEAD)"
5047
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(CONFLOC) $(VEROPTS) $(GIT_HASH)
@@ -61,10 +58,6 @@ clean:
6158
rm -rf "$(BUILDDIR)"
6259
rm -f source/_replacevars.rst
6360

64-
config:
65-
mkdir -pv build
66-
cat python-scripts/conf.py ${TAGFILE} ${FAMILYSETUPFILE} > build/conf.py
67-
6861
lint:
6962
rstcheck -r "$(SOURCEDIR)"
7063

0 commit comments

Comments
 (0)