diff options
| author | Tobias Wiese <tobias@tobiaswiese.com> | 2020-08-07 17:40:14 +0200 |
|---|---|---|
| committer | Tobias Wiese <tobias@tobiaswiese.com> | 2020-08-07 17:40:14 +0200 |
| commit | e1cfd1c7d296cd691d2194187575f3302f66ef92 (patch) | |
| tree | 7f871b9ad5e64f4067b5cd5662e2194f18924324 | |
| parent | fc513db3e8bca6be022e95a75723143cb6eca36e (diff) | |
reorganize directory structure.
move the content of the src/ directory up into the root.
There is no real need for putting those files inside an extra directory.
Signed-off-by: Tobias Wiese <tobias@tobiaswiese.com>
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 49 | ||||
| -rw-r--r-- | exchange.c (renamed from src/exchange.c) | 0 | ||||
| -rw-r--r-- | src/Makefile | 39 |
4 files changed, 41 insertions, 49 deletions
@@ -1,3 +1,3 @@ *.[oa] *~ -/src/exchange +/exchange @@ -1,14 +1,45 @@ -SHELL = /bin/sh -prefix = /usr/local +SHELL = /bin/sh +prefix = /usr/local -.PHONY: all clean -all clean: - @$(MAKE) -C src/ $@ +VERSION = $(shell git describe --dirty --always) +DATE_FMT = +%b %d %Y %H:%M:%S UTC + +ifdef SOURCE_DATE_EPOCH + BUILD_DATE ?= $(shell \ + date -u -d "@$(SOURCE_DATE_EPOCH)" "$(DATE_FMT)" 2>/dev/null \ + || date -u -r "@$(SOURCE_DATE_EPOCH)" "$(DATE_FMT)" 2>/dev/null \ + || date -u "$(DATE_FMT)") +else + BUILD_DATE ?= $(shell date -u "$(DATE_FMT)") +endif + +INSTALL = install + +CFLAGS += -Wall -DVERSION="\"$(VERSION)\"" -DBUILD_DATE="\"$(BUILD_DATE)\"" +LDFLAGS += + +TARGETS := exchange +MAINS := $(addsuffix .o, $(TARGETS)) +OBJ := $(MAINS) + +.PHONY: all +all: $(TARGETS) + +.PHONY: clean +clean: + rm -f $(OBJ) $(TARGETS) .PHONY: distclean distclean: clean -.PHONY: install uninstall -install uninstall: - $(eval dd := $(shell test -z "$(DESTDIR)" || realpath -m "$(DESTDIR)")) - @$(MAKE) -C src/ $@ DESTDIR=$(dd) prefix=$(prefix) +.PHONY: install +install: $(TARGETS) + $(INSTALL) -Dt "$(DESTDIR)$(prefix)/bin" $(TARGETS) + +.PHONY: uninstall +uninstall: + cd $(DESTDIR)$(prefix)/bin && rm -f $(TARGETS) + + +$(TARGETS): % : %.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ diff --git a/src/exchange.c b/exchange.c index c818606..c818606 100644 --- a/src/exchange.c +++ b/exchange.c diff --git a/src/Makefile b/src/Makefile deleted file mode 100644 index cfb66b7..0000000 --- a/src/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -VERSION = $(shell git describe --dirty --always) -DATE_FMT = +%b %d %Y %H:%M:%S UTC - -ifdef SOURCE_DATE_EPOCH - BUILD_DATE ?= $(shell \ - date -u -d "@$(SOURCE_DATE_EPOCH)" "$(DATE_FMT)" 2>/dev/null \ - || date -u -r "@$(SOURCE_DATE_EPOCH)" "$(DATE_FMT)" 2>/dev/null \ - || date -u "$(DATE_FMT)") -else - BUILD_DATE ?= $(shell date -u "$(DATE_FMT)") -endif - -INSTALL = install - -CFLAGS += -Wall -DVERSION="\"$(VERSION)\"" -DBUILD_DATE="\"$(BUILD_DATE)\"" -LDFLAGS += - -TARGETS := exchange -MAINS := $(addsuffix .o, $(TARGETS)) -OBJ := $(MAINS) - -.PHONY: all -all: $(TARGETS) - -.PHONY: clean -clean: - rm -f $(OBJ) $(TARGETS) - -.PHONY: install -install: $(TARGETS) - $(INSTALL) -Dt "$(DESTDIR)$(prefix)/bin" $(TARGETS) - -.PHONY: uninstall -uninstall: - cd $(DESTDIR)$(prefix)/bin && rm -f $(TARGETS) - - -$(TARGETS): % : %.o - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ |