Skip to content

Commit f4c8f59

Browse files
committed
Updates to makefile
1 parent 21f6bd0 commit f4c8f59

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@ BUILD_FLAGS = -ldflags "-s -w $(BUILD_LD_FLAGS)"
1313
BUILD_VERSION = $(shell git describe --tags)
1414
PLUGIN_DIR = $(wildcard plugin/*)
1515

16-
.PHONY: all server dependencies mkdir clean
16+
.PHONY: all server plugins dependencies mkdir clean
1717

18-
all: clean server plugins $(PLUGIN_DIR)
18+
all: clean server plugins
1919

2020
server: dependencies mkdir
2121
@echo Build server
2222
@${GO} build -o ${BUILD_DIR}/server ${BUILD_FLAGS} github.com/djthorpe/go-server/cmd/server
2323

24-
plugins:
25-
@echo Build httpserver and log plugins
24+
plugins: $(PLUGIN_DIR)
25+
@echo Build plugin httpserver
2626
@${GO} build -buildmode=plugin -o ${BUILD_DIR}/httpserver.plugin ${BUILD_FLAGS} github.com/djthorpe/go-server/plugin/httpserver
27+
@echo Build plugin log
2728
@${GO} build -buildmode=plugin -o ${BUILD_DIR}/log.plugin ${BUILD_FLAGS} github.com/djthorpe/go-server/plugin/log
2829

2930
$(PLUGIN_DIR): FORCE

etc/server.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Plugins to load, the order of these is important
22
plugins:
3-
- build/log.plugin
43
- build/httpserver.plugin
4+
- build/log.plugin
55
- build/sqlite3.plugin
66

77
# HTTP Server parameters

0 commit comments

Comments
 (0)