diff --git a/Makefile b/Makefile index 68e2e62..16f81ed 100644 --- a/Makefile +++ b/Makefile @@ -127,7 +127,7 @@ build-scratch: .PHONY: docker-build docker-build: - docker build \ + @docker build \ --tag $(DOCKER_IMAGE_NAME) \ --tag $(DOCKER_IMAGE_NAME):$(BUILD_VERSION) \ . @@ -150,8 +150,8 @@ coverage: coverage-osarch-specific .PHONY: check-coverage check-coverage: export SENZING_LOG_LEVEL=TRACE check-coverage: - go test ./... -coverprofile=./cover.out -covermode=atomic -coverpkg=./... - ${GOBIN}/go-test-coverage --config=.github/coverage/.testcoverage.yaml + @go test ./... -coverprofile=./cover.out -covermode=atomic -coverpkg=./... + @${GOBIN}/go-test-coverage --config=.github/coverage/.testcoverage.yaml # ----------------------------------------------------------------------------- # Run diff --git a/makefiles/darwin.mk b/makefiles/darwin.mk index a599f0a..71508f3 100644 --- a/makefiles/darwin.mk +++ b/makefiles/darwin.mk @@ -43,7 +43,7 @@ coverage-osarch-specific: .PHONY: documentation-osarch-specific documentation-osarch-specific: - godoc & + @godoc & @open http://localhost:6060 diff --git a/makefiles/linux.mk b/makefiles/linux.mk index 842d4d2..055c12a 100644 --- a/makefiles/linux.mk +++ b/makefiles/linux.mk @@ -6,6 +6,7 @@ LD_LIBRARY_PATH ?= /opt/senzing/g2/lib SENZING_TOOLS_DATABASE_URL ?= sqlite3://na:na@nowhere/tmp/sqlite/G2C.db +PATH := $(MAKEFILE_DIRECTORY)/bin:/$(HOME)/go/bin:$(PATH) # ----------------------------------------------------------------------------- # OS specific targets @@ -38,8 +39,8 @@ coverage-osarch-specific: .PHONY: documentation-osarch-specific documentation-osarch-specific: - godoc & - xdg-open http://localhost:6060 + @godoc & + @xdg-open http://localhost:6060 .PHONY: hello-world-osarch-specific @@ -51,8 +52,8 @@ hello-world-osarch-specific: package-osarch-specific: docker-build-package @mkdir -p $(TARGET_DIRECTORY) || true @CONTAINER_ID=$$(docker create $(DOCKER_BUILD_IMAGE_NAME)); \ - docker cp $$CONTAINER_ID:/output/. $(TARGET_DIRECTORY)/; \ - docker rm -v $$CONTAINER_ID + @docker cp $$CONTAINER_ID:/output/. $(TARGET_DIRECTORY)/; \ + @docker rm -v $$CONTAINER_ID .PHONY: run-osarch-specific diff --git a/makefiles/windows.mk b/makefiles/windows.mk index 0c0584e..7883306 100644 --- a/makefiles/windows.mk +++ b/makefiles/windows.mk @@ -17,13 +17,13 @@ build-osarch-specific: windows/amd64 .PHONY: clean-osarch-specific clean-osarch-specific: - del /F /S /Q $(GOPATH)/bin/$(PROGRAM_NAME) - del /F /S /Q $(MAKEFILE_DIRECTORY)/coverage.html - del /F /S /Q $(MAKEFILE_DIRECTORY)/coverage.out - del /F /S /Q $(MAKEFILE_DIRECTORY)/cover.out - del /F /S /Q $(TARGET_DIRECTORY) - del /F /S /Q C:\Temp\sqlite - taskkill /f /t/im godoc + @del /F /S /Q $(GOPATH)/bin/$(PROGRAM_NAME) + @del /F /S /Q $(MAKEFILE_DIRECTORY)/coverage.html + @del /F /S /Q $(MAKEFILE_DIRECTORY)/coverage.out + @del /F /S /Q $(MAKEFILE_DIRECTORY)/cover.out + @del /F /S /Q $(TARGET_DIRECTORY) + @del /F /S /Q C:\Temp\sqlite + @taskkill /f /t/im godoc .PHONY: coverage-osarch-specific