Update Makefile

hmgle · Jun 26, 2021 · 642767d · 642767d
1 parent a3c4ef3
commit 642767d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 graftcp
-graftcp-local/graftcp-local
-graftcp-local/.gopath
+local/cmd/graftcp-local/graftcp-local
+local/cmd/mgraftcp/mgraftcp
 
 *.o
 *.d

diff --git a/Makefile b/Makefile
@@ -95,5 +95,5 @@ sinclude $(SRC:.c=.d)
 		rm -f $@.$$$$
 
 clean::
-	-rm -f *.o graftcp *.d
+	-rm -f *.o *.a graftcp *.d
 	$(MAKE) -C local $@
diff --git a/local/Makefile b/local/Makefile
@@ -14,9 +14,12 @@ all:: $(TARGET)
 cmd/graftcp-local/graftcp-local: $(wildcard *.go) $(wildcard cmd/graftcp-local/*.go)
 	cd cmd/graftcp-local && go build -ldflags "-s -w -X main.version=${VERSION}"
 
-cmd/mgraftcp/mgraftcp: $(wildcard *.go) $(wildcard cmd/mgraftcp/*.go)
+cmd/mgraftcp/mgraftcp: $(wildcard *.go) $(wildcard cmd/mgraftcp/*.go) ../libgraftcp.a
 	cd cmd/mgraftcp && go build -ldflags "-s -w -X main.version=${VERSION}"
 
+../libgraftcp.a:
+	$(MAKE) -C .. libgraftcp.a
+
 install:: cmd/graftcp-local/graftcp-local
 	$(INSTALL) $< $(DESTDIR)$(BINDIR)/$<