Skip to content

Commit

Permalink
CQ: Only use tab indentation in Makefiles
Browse files Browse the repository at this point in the history
  • Loading branch information
echoix committed Dec 1, 2024
1 parent 9350001 commit 49918fe
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 39 deletions.
4 changes: 2 additions & 2 deletions db/drivers/mysql/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ endif

include $(MODULE_TOPDIR)/include/Make/DB.make

LIBES = $(DBMIDRIVERLIB) $(DBMIBASELIB) $(DBSTUBSLIB) \
$(GISLIB) $(DATETIMELIB)
LIBES = $(DBMIDRIVERLIB) $(DBMIBASELIB) $(DBSTUBSLIB) \
$(GISLIB) $(DATETIMELIB)
EXTRA_CFLAGS = $(MYSQLINCPATH)
EXTRA_LDFLAGS = $(MYSQLLIBPATH)

Expand Down
26 changes: 13 additions & 13 deletions include/Make/Install.make
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ $(DESTDIR)$(INST_DIR) $(DESTDIR)$(UNIX_BIN):

$(STARTUP): $(ARCH_DISTDIR)/$(GRASS_NAME).tmp
sed -e 's#'@GISBASE@'#'$(INST_DIR)'#g' \
-e 's#'@LD_LIBRARY_PATH_VAR@'#'$(LD_LIBRARY_PATH_VAR)'#g' \
-e 's#'@CONFIG_PROJSHARE@'#'$(PROJSHARE)'#g' \
$< > $@
-e 's#'@LD_LIBRARY_PATH_VAR@'#'$(LD_LIBRARY_PATH_VAR)'#g' \
-e 's#'@CONFIG_PROJSHARE@'#'$(PROJSHARE)'#g' \
$< > $@
-$(CHMOD) a+x $@

define fix_gisbase
Expand Down Expand Up @@ -173,16 +173,16 @@ BINDISTNAME = grass-$(GRASS_VERSION_NUMBER)-$(ARCH)-$(DATE)
real-bindist:
-tar cCBf $(ARCH_DISTDIR) - $(BIN_DIST_FILES) | gzip -fc > $(BINDISTNAME).tar.gz
-size=`ls -l $(BINDISTNAME).tar.gz | awk '{print $$5}'`; \
sed -e "s/BIN_DIST_VERSION/$(GRASS_VERSION_NUMBER)-$(ARCH)-$(DATE)/" \
-e "s/GRASSPRG_NAME/$(GRASS_NAME)/" \
-e "s/SIZE_TAR_FILE/$$size/" -e "s#BIN_DIST_DIR#'$(INST_DIR)'#" \
-e "s/ARCHITECTURE/$(ARCH)/" \
-e "s/LD_LIBRARY_PATH_VAR/$(LD_LIBRARY_PATH_VAR)/" \
-e "s/TEST_STR=/TEST_STR=executable/" \
-e "s#IMPORTANT.*#Generated from the binaryInstall.src file using the command make bindist#" \
-e "s/# executable shell.*//" -e "s/# make bindist.*//" \
binaryInstall.src > $(BINDISTNAME)-install.sh ; \
chmod a+x $(BINDISTNAME)-install.sh 2>/dev/null
sed -e "s/BIN_DIST_VERSION/$(GRASS_VERSION_NUMBER)-$(ARCH)-$(DATE)/" \
-e "s/GRASSPRG_NAME/$(GRASS_NAME)/" \
-e "s/SIZE_TAR_FILE/$$size/" -e "s#BIN_DIST_DIR#'$(INST_DIR)'#" \
-e "s/ARCHITECTURE/$(ARCH)/" \
-e "s/LD_LIBRARY_PATH_VAR/$(LD_LIBRARY_PATH_VAR)/" \
-e "s/TEST_STR=/TEST_STR=executable/" \
-e "s#IMPORTANT.*#Generated from the binaryInstall.src file using the command make bindist#" \
-e "s/# executable shell.*//" -e "s/# make bindist.*//" \
binaryInstall.src > $(BINDISTNAME)-install.sh ; \
chmod a+x $(BINDISTNAME)-install.sh 2>/dev/null

bindist-macosx:
$(MAKE) -C macosx bindist-macosx
Expand Down
34 changes: 17 additions & 17 deletions man/sphinx/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,17 @@ json:
htmlhelp:
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
@echo
@echo "Build finished; now you can run HTML Help Workshop with the" \
".hhp project file in $(BUILDDIR)/htmlhelp."
@echo "Build finished; now you can run HTML Help Workshop with the" \
".hhp project file in $(BUILDDIR)/htmlhelp."

qthelp:
$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
@echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/grass_gis.qhcp"
@echo "To view the help file:"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/grass_gis.qhc"
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/grass_gis.qhcp"
@echo "To view the help file:"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/grass_gis.qhc"

devhelp:
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
Expand All @@ -98,9 +98,9 @@ epub:
latex:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
@echo "Run \`make' in that directory to run these through (pdf)latex" \
"(use \`make latexpdf' here to do that automatically)."
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
@echo "Run \`make' in that directory to run these through (pdf)latex" \
"(use \`make latexpdf' here to do that automatically)."

latexpdf:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
Expand All @@ -121,9 +121,9 @@ man:
texinfo:
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
@echo
@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
@echo "Run \`make' in that directory to run these through makeinfo" \
"(use \`make info' here to do that automatically)."
@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
@echo "Run \`make' in that directory to run these through makeinfo" \
"(use \`make info' here to do that automatically)."

info:
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
Expand All @@ -144,10 +144,10 @@ changes:
linkcheck:
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
@echo
@echo "Link check complete; look for any errors in the above output " \
"or in $(BUILDDIR)/linkcheck/output.txt."
@echo "Link check complete; look for any errors in the above output " \
"or in $(BUILDDIR)/linkcheck/output.txt."

doctest:
$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
@echo "Testing of doctests in the sources finished, look at the " \
"results in $(BUILDDIR)/doctest/output.txt."
@echo "Testing of doctests in the sources finished, look at the " \
"results in $(BUILDDIR)/doctest/output.txt."
8 changes: 4 additions & 4 deletions python/grass/docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ libpythonlatex:
$(call run_grass,$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex)
@echo
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
@echo "Run \`make' in that directory to run these through (pdf)latex" \
"(use \`make latexpdf' here to do that automatically)."
@echo "Run \`make' in that directory to run these through (pdf)latex" \
"(use \`make latexpdf' here to do that automatically)."

libpythonlatexpdf:
@echo "SPHINXBUILD: Using <$(SPHINXBUILD)>"
Expand All @@ -119,5 +119,5 @@ libpythonman:
libpythondoctest:
@echo "SPHINXBUILD: Using <$(SPHINXBUILD)>"
$(call run_grass,$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest)
@echo "Testing of doctests in the sources finished, look at the " \
"results in $(BUILDDIR)/doctest/output.txt."
@echo "Testing of doctests in the sources finished, look at the " \
"results in $(BUILDDIR)/doctest/output.txt."
4 changes: 2 additions & 2 deletions raster3d/r3.showdspf/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..

PGM=r3.showdspf

OGLLIB = $(XMLIBPATH) $(XLIBPATH) $(OPENGLWM) $(OPENGLULIB) $(OPENGLLIB) \
$(XMLIB) $(XTLIB) $(XLIB) $(XEXTRALIBS)
OGLLIB = $(XMLIBPATH) $(XLIBPATH) $(OPENGLWM) $(OPENGLULIB) $(OPENGLLIB) \
$(XMLIB) $(XTLIB) $(XLIB) $(XEXTRALIBS)

LDIR = $(MODULE_TOPDIR)/lib/dspf
EXTRA_CFLAGS = -I$(LDIR) -I. $(OPENGLINC) $(OPENGLWINC) $(XCFLAGS) $(XMINC)
Expand Down
2 changes: 1 addition & 1 deletion vector/v.voronoi/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ MODULE_TOPDIR = ../..
PGM = v.voronoi

SWEEP_OBJS = sw_edgelist.o sw_geometry.o sw_heap.o sw_main.o sw_memory.o sw_output.o \
sw_voronoi.o
sw_voronoi.o

v_voronoi_OBJS = vo_main.o vo_extend.o vo_write.o $(SWEEP_OBJS)

Expand Down

0 comments on commit 49918fe

Please sign in to comment.