From d9732f58a7609d7614c80bde3ac9d682ceabf698 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 8 Nov 2015 00:54:10 -0500 Subject: tidy Makefile --- Makefile | 12 +++++------- common.mk | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 96e078c..7f98070 100644 --- a/Makefile +++ b/Makefile @@ -37,12 +37,9 @@ CGO_CFLAGS = $(CFLAGS) -Wno-unused-parameter CGO_ENABLED = 1 deps += gopkg.in/yaml.v2 -deps += lukeshu.com/git/go/libgnulinux.git/dl -deps += lukeshu.com/git/go/libgnulinux.git/getgr -deps += lukeshu.com/git/go/libgnulinux.git/inotify -deps += lukeshu.com/git/go/libnslcd.git/proto -deps += lukeshu.com/git/go/libnslcd.git/systemd -deps += lukeshu.com/git/go/libsystemd.git/sd_daemon +deps += lukeshu.com/git/go/libgnulinux.git +deps += lukeshu.com/git/go/libnslcd.git +deps += lukeshu.com/git/go/libsystemd.git srcdir := $(abspath $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))) topdir := $(srcdir) @@ -53,12 +50,13 @@ generate += $(addprefix $(topdir)/src/,$(deps)) generate += $(topdir)/LICENSE.lgpl-2.1.txt $(topdir)/LICENSE.gpl-2.txt $(topdir)/LICENSE.apache-2.0.txt generate_secondary += $(topdir)/src/*.*/ build += $(topdir)/bin/nshd $(topdir)/nshd.service $(topdir)/nshd.socket $(topdir)/test/runner -build_secondary += $(topdir)/test/*.o +build_secondary += $(topdir)/bin $(topdir)/pkg $(topdir)/test/*.o .var.* install += $(addprefix $(DESTDIR),$(bindir)/nshd $(systemddir)/system/nshd.socket $(systemddir)/system/nshd.service) ifeq (1,$(words $(MAKEFILE_LIST))) include $(topdir)/common.mk endif +src/lukeshu.com/git/go/libnslcd.git/proto/Makefile: $(topdir)/src/lukeshu.com/git/go/libnslcd.git $(topdir)/LICENSE.lgpl-2.1.txt: $(NET) curl https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt > $@ diff --git a/common.mk b/common.mk index 56cfc29..41f5c79 100644 --- a/common.mk +++ b/common.mk @@ -8,7 +8,7 @@ rel = $(patsubst $(abspath .)/%,./%,$(abspath $1)) all: build .PHONY: all --include $(addsuffix /Makefile,$(subdirs)) +include $(addsuffix /Makefile,$(subdirs)) generate: $(generate) .PHONY: generate -- cgit v1.2.2