Skip to content

Commit 137df0e

Browse files
committed
chore: rename couch make target to couch-core
This is in preparation for using parallel make features. Since both .PHONY couch and src/couch exist, the parallising of src/* would clobber the top level .PHONY couch target.
1 parent d103a7f commit 137df0e

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ endif
106106

107107
.PHONY: all
108108
# target: all - Build everything
109-
all: couch fauxton docs escriptize nouveau
109+
all: couch-core fauxton docs escriptize nouveau
110110

111111

112112
.PHONY: help
@@ -123,9 +123,9 @@ help:
123123
################################################################################
124124

125125

126-
.PHONY: couch
127-
# target: couch - Build CouchDB core, use ERL_COMPILER_OPTIONS to provide custom compiler's options
128-
couch: config.erl
126+
.PHONY: couch-core
127+
# target: couch-core - Build CouchDB core, use ERL_COMPILER_OPTIONS to provide custom compiler's options
128+
couch-core: config.erl
129129
@COUCHDB_VERSION=$(COUCHDB_VERSION) COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) $(REBAR) compile $(COMPILE_OPTS)
130130
ifeq ($(with_spidermonkey), true)
131131
@cp src/couch/priv/couchjs bin/
@@ -146,7 +146,7 @@ fauxton: share/www
146146

147147
.PHONY: escriptize
148148
# target: escriptize - Build CLI tools
149-
escriptize: couch
149+
escriptize: couch-core
150150
@$(REBAR) -r escriptize apps=weatherreport
151151
@cp src/weatherreport/weatherreport bin/weatherreport
152152

@@ -199,7 +199,7 @@ just-eunit:
199199
.PHONY: soak-eunit
200200
soak-eunit: export BUILDDIR = $(CURDIR)
201201
soak-eunit: export ERL_AFLAGS = -config $(CURDIR)/rel/files/eunit.config
202-
soak-eunit: couch
202+
soak-eunit: couch-core
203203
@$(REBAR) setup_eunit 2> /dev/null
204204
while [ $$? -eq 0 ] ; do $(REBAR) -r eunit $(EUNIT_OPTS) ; done
205205

@@ -356,7 +356,7 @@ weatherreport-test: devclean escriptize
356356

357357
.PHONY: quickjs-test262
358358
# target: quickjs-javascript-tests - Run QuickJS JS conformance tests
359-
quickjs-test262: couch
359+
quickjs-test262: couch-core
360360
make -C src/couch_quickjs/quickjs test2-bootstrap
361361
make -C src/couch_quickjs/quickjs test2
362362

@@ -578,15 +578,15 @@ endif
578578
nouveau-test: nouveau-test-gradle nouveau-test-elixir
579579

580580
.PHONY: nouveau-test-gradle
581-
nouveau-test-gradle: couch nouveau
581+
nouveau-test-gradle: couch-core nouveau
582582
ifeq ($(with_nouveau), true)
583583
@cd nouveau && $(GRADLE) test --info --rerun
584584
endif
585585

586586
.PHONY: nouveau-test-elixir
587587
nouveau-test-elixir: export MIX_ENV=integration
588588
nouveau-test-elixir: elixir-init devclean
589-
nouveau-test-elixir: couch nouveau
589+
nouveau-test-elixir: couch-core nouveau
590590
ifeq ($(with_nouveau), true)
591591
@dev/run "$(TEST_OPTS)" -n 1 -q -a adm:pass --with-nouveau \
592592
--locald-config test/config/test-config.ini \

0 commit comments

Comments
 (0)