From 6b6a6f4331631bb4ef92a23c80e982f2a6b76109 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Sun, 25 Dec 2011 16:15:15 +0100 Subject: Makefile: simplified Makefile TOP should not be needed to set anymore Makefile.inc could be included before all other --- Makefile.inc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Makefile.inc') diff --git a/Makefile.inc b/Makefile.inc index bc56d6d9..661da8b8 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1,10 +1,11 @@ # -*- mode: makefile -*- +TOP:=$(dir $(lastword $(MAKEFILE_LIST))) -headers+=$(wildcard $(TOP)/src/*/*.hpp) $(wildcard $(TOP)/src/*/*/*.hpp) -sources+=$(wildcard $(TOP)/src/*/*.cpp) $(wildcard $(TOP)/src/*/*/*.cpp) +headers+=$(wildcard $(TOP)src/*/*.hpp) $(wildcard $(TOP)src/*/*/*.hpp) +sources+=$(wildcard $(TOP)src/*/*.cpp) $(wildcard $(TOP)src/*/*/*.cpp) -deps:=$(sources:.cpp=.d) -objects:=$(sources:.cpp=.o) +deps=$(sources:.cpp=.d) +objects=$(sources:.cpp=.o) # APPS PKG_CONFIG:=pkg-config @@ -13,7 +14,7 @@ LOG4CPP_CONFIG:=log4cpp-config # CFLAGS PEDENTIC:=-Wall -Werror DEBUG:=-g -INC_PATH:=-I$(TOP)/src +INC_PATH:=-I$(TOP)src/ FTGL_CFLAGS:=$(shell $(PKG_CONFIG) ftgl --cflags) # LDFLAGS -- cgit v1.2.3