aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2011-12-25 16:15:15 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2013-01-05 17:17:50 +0100
commit6b6a6f4331631bb4ef92a23c80e982f2a6b76109 (patch)
tree0c8c89218ba6135f2c59308af512d9fe3d7bde35 /Makefile
parentfb70fe4e1a04b6041a50da7e2e76200fb18de0f9 (diff)
downloadusdx-6b6a6f4331631bb4ef92a23c80e982f2a6b76109.tar.gz
usdx-6b6a6f4331631bb4ef92a23c80e982f2a6b76109.tar.xz
usdx-6b6a6f4331631bb4ef92a23c80e982f2a6b76109.zip
Makefile: simplified Makefile
TOP should not be needed to set anymore Makefile.inc could be included before all other
Diffstat (limited to '')
-rw-r--r--Makefile8
-rw-r--r--Makefile.inc11
2 files changed, 9 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index f375a6ae..ee5c1138 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,8 @@
TARGET:=usdx
-TOP:=.
+include Makefile.inc
-headers:=$(wildcard ${TOP}/src/*.hpp)
-sources:=$(wildcard ${TOP}/src/*.cpp)
-
-include ${TOP}/Makefile.inc
+headers+=$(wildcard src/*.hpp)
+sources+=$(wildcard src/*.cpp)
##############################################################################
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