goat3d
diff Makefile @ 64:99715321ad6d
merged
author | John Tsiombikas <nuclear@member.fsf.org> |
---|---|
date | Thu, 17 Apr 2014 08:53:42 +0300 |
parents | ca549434dc95 |
children |
line diff
1.1 --- a/Makefile Thu Apr 17 08:50:36 2014 +0300 1.2 +++ b/Makefile Thu Apr 17 08:53:42 2014 +0300 1.3 @@ -10,11 +10,9 @@ 1.4 1.5 openctm = libs/openctm/libopenctm.a 1.6 tinyxml2 = libs/tinyxml2/libtinyxml2.a 1.7 -vmath = libs/vmath/libvmath.a 1.8 -anim = libs/anim/libanim.a 1.9 1.10 -extinc = -Ilibs/openctm -Ilibs/tinyxml2 -Ilibs/anim 1.11 -extlibs = $(openctm) $(tinyxml2) $(anim) $(vmath) 1.12 +extinc = -Ilibs/openctm -Ilibs/tinyxml2 1.13 +extlibs = $(openctm) $(tinyxml2) 1.14 1.15 name = goat3d 1.16 so_major = 0 1.17 @@ -37,7 +35,7 @@ 1.18 CC = clang 1.19 CXX = clang++ 1.20 CXXFLAGS = -pedantic -Wall $(dbg) $(opt) $(pic) $(extinc) 1.21 -LDFLAGS = $(extlibs) -lpthread 1.22 +LDFLAGS = $(extlibs) -lvmath -lanim -lpthread 1.23 1.24 .PHONY: all 1.25 all: $(lib_so) $(lib_a) 1.26 @@ -56,14 +54,6 @@ 1.27 $(tinyxml2): 1.28 $(MAKE) -C libs/tinyxml2 1.29 1.30 -.PHONY: $(vmath) 1.31 -$(vmath): 1.32 - $(MAKE) -C libs/vmath 1.33 - 1.34 -.PHONY: $(anim) 1.35 -$(anim): 1.36 - $(MAKE) -C libs/anim 1.37 - 1.38 -include $(dep) 1.39 1.40 %.d: %.cc 1.41 @@ -73,6 +63,11 @@ 1.42 clean: 1.43 rm -f $(obj) $(lib_a) $(lib_so) 1.44 1.45 +.PHONY: cleanlibs 1.46 +cleanlibs: 1.47 + $(MAKE) -C libs/openctm clean 1.48 + $(MAKE) -C libs/tinyxml2 clean 1.49 + 1.50 .PHONY: cleandep 1.51 cleandep: 1.52 rm -f $(dep)