Skip to content

Commit

Permalink
Refactor for single-command
Browse files Browse the repository at this point in the history
  • Loading branch information
hmgle committed Jun 26, 2021
1 parent 532773d commit a3c4ef3
Show file tree
Hide file tree
Showing 61 changed files with 202 additions and 3,707 deletions.
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ CFLAGS += -DVERSION=\"$(VERSION)\"

SRC := $(wildcard *.c)

GRAFTCP_LOCAL_BIN = graftcp-local/graftcp-local
GRAFTCP_LOCAL_BIN = local/cmd/graftcp-local/graftcp-local local/cmd/mgraftcp/mgraftcp
TARGET = graftcp $(GRAFTCP_LOCAL_BIN)

all:: $(TARGET)
Expand All @@ -58,15 +58,15 @@ libgraftcp.a: graftcp.o util.o string-set.o
$(CC) $(CFLAGS) -c -o $@ $<

$(GRAFTCP_LOCAL_BIN)::
$(MAKE) -C graftcp-local VERSION=$(VERSION)
$(MAKE) -C local VERSION=$(VERSION)

install:: graftcp $(GRAFTCP_LOCAL_BIN)
$(INSTALL) $< $(DESTDIR)$(BINDIR)/$<
$(MAKE) -C graftcp-local $@
$(MAKE) -C local $@

uninstall::
-rm -f $(DESTDIR)$(BINDIR)/graftcp
$(MAKE) -C graftcp-local $@
$(MAKE) -C local $@

install_graftcp:: graftcp
$(INSTALL) $< $(DESTDIR)$(BINDIR)/$<
Expand All @@ -75,16 +75,16 @@ uninstall_graftcp::
-rm -f $(DESTDIR)$(BINDIR)/graftcp

install_systemd::
$(MAKE) -C graftcp-local install_systemd
$(MAKE) -C local install_systemd

uninstall_systemd::
$(MAKE) -C graftcp-local uninstall_systemd
$(MAKE) -C local uninstall_systemd

install_graftcp_local::
$(MAKE) -C graftcp-local install
$(MAKE) -C local install

uninstall_graftcp_local::
$(MAKE) -C graftcp-local uninstall
$(MAKE) -C local uninstall

sinclude $(SRC:.c=.d)

Expand All @@ -96,4 +96,4 @@ sinclude $(SRC:.c=.d)

clean::
-rm -f *.o graftcp *.d
$(MAKE) -C graftcp-local $@
$(MAKE) -C local $@
38 changes: 0 additions & 38 deletions graftcp-local/clientMain.go

This file was deleted.

1 change: 0 additions & 1 deletion graftcp-local/contrib/lib/libgraftcp.a

This file was deleted.

1 change: 0 additions & 1 deletion graftcp-local/graftcp

This file was deleted.

55 changes: 0 additions & 55 deletions graftcp-local/singleMain.go

This file was deleted.

20 changes: 0 additions & 20 deletions graftcp-local/vendor/github.com/hashicorp/go-syslog/LICENSE

This file was deleted.

11 changes: 0 additions & 11 deletions graftcp-local/vendor/github.com/hashicorp/go-syslog/README.md

This file was deleted.

Loading

0 comments on commit a3c4ef3

Please sign in to comment.