From 88b8b932308215c770c4e9aae96a098421b8a477 Mon Sep 17 00:00:00 2001 From: Pierre Habouzit Date: Sun, 11 Jan 2009 21:15:47 +0100 Subject: [PATCH] simplify toplevel Makefile so that it can inclide common.mk Signed-off-by: Pierre Habouzit --- Makefile | 10 +++++----- mk/common.mk | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index f6c11dd..e4f02ff 100644 --- a/Makefile +++ b/Makefile @@ -32,11 +32,9 @@ # see AUTHORS and source files for details # ############################################################################## -prefix ?= /usr/local - -PROGRAMS = postlicyd pfix-srsd -LIBS = common -SUBDIRS = $(LIBS) $(PROGRAMS) +PROGDIRS = postlicyd pfix-srsd +LIBDIRS = common +SUBDIRS = $(LIBDIRS) $(PROGDIRS) # RULES ###################################################################{{{ @@ -65,3 +63,5 @@ install-postlicyd-conf: .PHONY: clean distclean install install-% %-recurse ###########################################################################}}} + +include mk/common.mk diff --git a/mk/common.mk b/mk/common.mk index 058d21d..3192c11 100644 --- a/mk/common.mk +++ b/mk/common.mk @@ -34,9 +34,9 @@ __DIR__:=$(realpath $(dir $(lastword $(MAKEFILE_LIST)))) -include ../mk/cflags.mk +include $(__DIR__)/cflags.mk -prefix ?= /usr/local +prefix ?= /usr/local LDFLAGSBASE += $(if $(DARWIN),-L/opt/local/lib,-Wl,-warn-common) CFLAGSBASE += --std=gnu99 -I../ -I../common $(if $(DARWIN),-I/opt/local/include,) ASCIIDOC = asciidoc -f $(__DIR__)/asciidoc.conf -d manpage \ -- 2.20.1