Merge make targets for building binaries

Signed-off-by: Edmund Ochieng <[email protected]>

Author: OchiengEd

Makefile

@@ -309,8 +309,9 @@ export GO_BUILD_FLAGS :=
 export GO_BUILD_LDFLAGS := -s -w \
     -X '$(VERSION_PATH).version=$(VERSION)' \
 
-BINARIES=operator-controller
+BINARIES=operator-controller catalogd
 
+.PHONY: $(BINARIES)
 $(BINARIES):
 	go build $(GO_BUILD_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o $(BUILDBIN)/$@ ./cmd/$@
 
@@ -320,14 +321,14 @@ build-deps: manifests generate fmt
 .PHONY: build go-build-local
 build: build-deps go-build-local #HELP Build manager binary for current GOOS and GOARCH. Default target.
 go-build-local: BUILDBIN := bin
-go-build-local: $(BINARIES) go-build-catalogd-local
+go-build-local: $(BINARIES)
 
 .PHONY: build-linux go-build-linux
 build-linux: build-deps go-build-linux #EXHELP Build manager binary for GOOS=linux and local GOARCH.
 go-build-linux: BUILDBIN := bin/linux
 go-build-linux: export GOOS=linux
 go-build-linux: export GOARCH=amd64
-go-build-linux: $(BINARIES) go-build-catalogd-linux
+go-build-linux: $(BINARIES)
 
 .PHONY: run
 run: docker-build kind-cluster kind-load kind-deploy wait #HELP Build the operator-controller then deploy it into a new kind cluster.
@@ -397,19 +398,4 @@ deploy-docs: venv
 demo-update:
 	./hack/demo/generate-asciidemo.sh -u -n catalogd-demo catalogd-demo-script.sh
 
-# Catalogd targets
-.PHONY: catalogd-build go-build-catalogd-local $(CATALOGD_BINARIES)
-catalogd-build: go-build-catalogd-local ## Build binaries for current GOOS and GOARCH.
-go-build-catalogd-local: $(CATALOGD_BINARIES)
-$(CATALOGD_BINARIES): BUILDBIN = bin
-$(CATALOGD_BINARIES):
-	$(BUILDCMD)
-
-.PHONY: catalogd-build-linux go-build-catalogd-linux $(LINUX_BINARIES)
-catalogd-build-linux: go-build-catalogd-linux ## Build binaries for GOOS=linux and local GOARCH.
-go-build-catalogd-linux: $(LINUX_BINARIES)
-$(LINUX_BINARIES): BUILDBIN = bin/linux
-$(LINUX_BINARIES):
-	GOOS=linux $(BUILDCMD)
-
 include Makefile.venv