Combine identical darwin freebsd server function

ChrisSchreiber · Jan 22, 2019 · 4563ac0 · 4563ac0
1 parent 46a31ef
commit 4563ac0
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,2 @@
 /aws-vault
 /aws-vault-*
-.DS_Store
-*~
diff --git a/Makefile b/Makefile
@@ -24,13 +24,10 @@ aws-vault-darwin-amd64: $(SRC)
 aws-vault-windows-386.exe: $(SRC)
 	GOOS=windows GOARCH=386 go build -o $@ -ldflags="$(FLAGS)" .
 
-aws-vault-freebsd-386: $(SRC)
-	GOOS=freebsd GOARCH=386 go build -o $@ -ldflags="$(FLAGS)" .
-
 aws-vault-freebsd-amd64: $(SRC)
 	GOOS=freebsd GOARCH=amd64 go build -o $@ -ldflags="$(FLAGS)" .
 
-release: aws-vault-linux-amd64 aws-vault-darwin-amd64 aws-vault-windows-386.exe aws-vault-freebsd-386 aws-vault-freebsd-amd64
+release: aws-vault-linux-amd64 aws-vault-darwin-amd64 aws-vault-windows-386.exe aws-vault-freebsd-amd64
 
 clean:
-	rm -f aws-vault aws-vault-linux-amd64 aws-vault-darwin-amd64 aws-vault-windows-386.exe aws-vault-freebsd-386 aws-vault-freebsd-amd64
+	rm -f aws-vault aws-vault-linux-amd64 aws-vault-darwin-amd64 aws-vault-windows-386.exe aws-vault-freebsd-amd64
diff --git a/server/alias_darwin.go → server/alias_bsd.go b/server/alias_darwin.go → server/alias_bsd.go
@@ -1,4 +1,4 @@
-// build: darwin
+// +build darwin freebsd
 
 package server
 

diff --git a/server/alias_freebsd.go b/server/alias_freebsd.go
diff --git a/server/alias_linux.go b/server/alias_linux.go
@@ -1,4 +1,4 @@
-// build: linux
+// +build linux
 
 package server
 

diff --git a/server/alias_windows.go b/server/alias_windows.go
@@ -1,4 +1,4 @@
-// build: windows
+// +build windows
 
 package server