diff options
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | bitmaskd.go | 2 | ||||
| -rw-r--r-- | standalone.go (renamed from bitmask_go.go) | 6 | ||||
| -rw-r--r-- | standalone/bonafide.go (renamed from bitmask_go/bonafide.go) | 0 | ||||
| -rw-r--r-- | standalone/bonafide_test.go (renamed from bitmask_go/bonafide_test.go) | 0 | ||||
| -rw-r--r-- | standalone/launcher_linux.go (renamed from bitmask_go/launcher_linux.go) | 0 | ||||
| -rw-r--r-- | standalone/launcher_windows.go (renamed from bitmask_go/launcher_windows.go) | 0 | ||||
| -rw-r--r-- | standalone/main.go (renamed from bitmask_go/main.go) | 0 | ||||
| -rw-r--r-- | standalone/status.go (renamed from bitmask_go/status.go) | 0 | ||||
| -rw-r--r-- | standalone/vpn.go (renamed from bitmask_go/vpn.go) | 0 |
10 files changed, 9 insertions, 9 deletions
@@ -1,11 +1,11 @@ -.PHONY: all get build build_go icon locales generate_locales clean +.PHONY: all get build standalone icon locales generate_locales clean TAGS ?= gtk_3_18 all: icon locales get build get: - go get -tags $(TAGS) . ./bitmask_go + go get -tags $(TAGS) . ./standalone build: go build -tags $(TAGS) -ldflags "-X main.version=`git describe --tags`" @@ -13,11 +13,11 @@ build: test: go test -tags $(TAGS) ./... -build_go: - go build -tags "$(TAGS) bitmask_go" -ldflags "-X main.version=`git describe --tags`" +standalone: + go build -tags "$(TAGS) standalone" -ldflags "-X main.version=`git describe --tags`" build_win: - go build -tags "bitmask_go" -ldflags "-H windowsgui" + go build -tags "standalone" -ldflags "-H windowsgui" clean: make -C icon clean diff --git a/bitmaskd.go b/bitmaskd.go index aa94ca0..cb67b8b 100644 --- a/bitmaskd.go +++ b/bitmaskd.go @@ -1,4 +1,4 @@ -// +build !bitmask_go +// +build !standalone // Copyright (C) 2018 LEAP // // This program is free software: you can redistribute it and/or modify diff --git a/bitmask_go.go b/standalone.go index 38ec289..cda78f8 100644 --- a/bitmask_go.go +++ b/standalone.go @@ -1,4 +1,4 @@ -// +build bitmask_go +// +build standalone // Copyright (C) 2018 LEAP // // This program is free software: you can redistribute it and/or modify @@ -18,9 +18,9 @@ package main import ( "0xacab.org/leap/bitmask-systray/bitmask" - bitmask_go "0xacab.org/leap/bitmask-systray/bitmask_go" + standalone "0xacab.org/leap/bitmask-systray/standalone" ) func initBitmask() (bitmask.Bitmask, error) { - return bitmask_go.Init() + return standalone.Init() } diff --git a/bitmask_go/bonafide.go b/standalone/bonafide.go index 449383e..449383e 100644 --- a/bitmask_go/bonafide.go +++ b/standalone/bonafide.go diff --git a/bitmask_go/bonafide_test.go b/standalone/bonafide_test.go index 152b108..152b108 100644 --- a/bitmask_go/bonafide_test.go +++ b/standalone/bonafide_test.go diff --git a/bitmask_go/launcher_linux.go b/standalone/launcher_linux.go index 4046fa5..4046fa5 100644 --- a/bitmask_go/launcher_linux.go +++ b/standalone/launcher_linux.go diff --git a/bitmask_go/launcher_windows.go b/standalone/launcher_windows.go index c8e79b9..c8e79b9 100644 --- a/bitmask_go/launcher_windows.go +++ b/standalone/launcher_windows.go diff --git a/bitmask_go/main.go b/standalone/main.go index 357d53f..357d53f 100644 --- a/bitmask_go/main.go +++ b/standalone/main.go diff --git a/bitmask_go/status.go b/standalone/status.go index 5a1ee3d..5a1ee3d 100644 --- a/bitmask_go/status.go +++ b/standalone/status.go diff --git a/bitmask_go/vpn.go b/standalone/vpn.go index 44fa768..44fa768 100644 --- a/bitmask_go/vpn.go +++ b/standalone/vpn.go |