makefiles for extras

Former-commit-id: a8660dd709d78e9ae6c2f30740839d48f2f22dc1

build/Makefile

@@ -16,50 +16,39 @@ CFLAGS += $(OPTFLAGS)
 #CFLAGS += -DIGL_NO_OPENGL -DIGL_NO_ANTTWEAKBAR
 # We use well-supported features of c++11
 
-EXTRA_DIRS=
+EXTRAS=
 ifeq ($(IGL_WITH_BBW),1)
-	EXTRA_DIRS+=include/igl/bbw
 	EXTRAS += bbw
 endif
 ifeq ($(IGL_WITH_BOOST),1)
-	EXTRA_DIRS+=include/igl/boost
 	EXTRAS += boost
 endif
 ifeq ($(IGL_WITH_CGAL),1)
-	EXTRA_DIRS+=include/igl/cgal
 	EXTRAS += cgal
 endif
 ifeq ($(IGL_WITH_EMBREE),1)
-	EXTRA_DIRS+=include/igl/embree
 	EXTRAS += embree
 endif
 ifeq ($(IGL_WITH_MATLAB),1)
-	EXTRA_DIRS+=include/igl/matlab
 	EXTRAS += matlab
 endif
 ifeq ($(IGL_WITH_MOSEK),1)
-	EXTRA_DIRS+=include/igl/mosek
 	EXTRAS += mosek
 endif
 ifeq ($(IGL_WITH_PNG),1)
-	EXTRA_DIRS+=include/igl/png
 	EXTRAS += png
 endif
 ifeq ($(IGL_WITH_SVD3X3),1)
-	EXTRA_DIRS+=include/igl/svd3x3
 	EXTRAS += svd3x3
 endif
 ifeq ($(IGL_WITH_TETGEN),1)
 	# append tetgen extra dir
-	EXTRA_DIRS+=include/igl/tetgen
 	EXTRAS += tetgen
 endif
 ifeq ($(IGL_WITH_VIEWER),1)
-	EXTRA_DIRS+=include/igl/viewer
 	EXTRAS += viewer
 endif
 ifeq ($(IGL_WITH_XML),1)
-	EXTRA_DIRS+=include/igl/xml
 	EXTRAS += xml
 endif
 
@@ -70,10 +59,9 @@ lib: ../lib/libigl.a
 examples: lib extras
 	make -C ../examples
 extras:
-	for p in  $(EXTRA_DIRS); \
+	for p in  $(EXTRAS); \
 	do \
-	echo "cd $$p" ; \
-	$(MAKE) -C $$p $(DEBUG); \
+	$(MAKE) -f Makefile_$$p $(DEBUG); \
 	done
 
 

build/Makefile_bbw

@@ -1,22 +1,21 @@
-include ../../../Makefile.conf
-
 .PHONY: all
 all: libiglbbw
 debug: libiglbbw
 
-include ../../../Makefile.conf
+include Makefile.conf
 all: OPTFLAGS += -O3 -DNDEBUG $(OPENMP)
 debug: OPTFLAGS += -g -Wall
 CFLAGS += $(OPTFLAGS)
 
 .PHONY: libiglbbw
-libiglbbw: obj ../../../lib/libiglbbw.a
+libiglbbw: obj ../lib/libiglbbw.a
 
-CPP_FILES=$(wildcard *.cpp)
+SRC_DIR=../include/igl/bbw/
+CPP_FILES=$(wildcard $(SRC_DIR)*.cpp)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o)))
 
 # include igl headers
-INC+=-I../../../include/
+INC+=-I../include/
 
 # EXPECTS THAT CFLAGS IS ALREADY SET APPROPRIATELY 
 
@@ -47,13 +46,13 @@ endif
 obj: 
 	mkdir -p obj
 
-../../../lib/libiglbbw.a: $(OBJ_FILES)
+../lib/libiglbbw.a: $(OBJ_FILES)
 	rm -f $@
 	ar cqs $@ $(OBJ_FILES)
 
-obj/%.o: %.cpp %.h
+obj/%.o: $(SRC_DIR)/%.cpp $(SRC_DIR)/%.h
 	$(GG) $(AFLAGS) $(CFLAGS) -c -o $@ $< $(INC)
 
 clean:
 	rm -f obj/*.o
-	rm -f ../../../lib/libiglbbw.a
+	rm -f ../lib/libiglbbw.a

build/Makefile_boost

@@ -1,21 +1,22 @@
-include ../../../Makefile.conf
+include Makefile.conf
 
 .PHONY: all
 all: libiglboost
 debug: libiglboost
 
-include ../../../Makefile.conf
+include Makefile.conf
 all: CFLAGS += -O3 -DNDEBUG
 debug: CFLAGS += -g -Wall 
 
 .PHONY: libiglboost
-libiglboost: obj ../../../lib/libiglboost.a
+libiglboost: obj ../lib/libiglboost.a
 
-CPP_FILES=$(wildcard *.cpp)
+SRC_DIR=../include/igl/boost/
+CPP_FILES=$(wildcard $(SRC_DIR)*.cpp)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o)))
 
 # include igl headers
-INC+=-I../../../include/
+INC+=-I../include/
 
 # EXPECTS THAT CFLAGS IS ALREADY SET APPROPRIATELY 
 
@@ -31,13 +32,13 @@ INC+=$(BOOST_INC)
 obj: 
 	mkdir -p obj
 
-../../../lib/libiglboost.a: $(OBJ_FILES)
+../lib/libiglboost.a: $(OBJ_FILES)
 	rm -f $@
 	ar cqs $@ $(OBJ_FILES)
 
-obj/%.o: %.cpp %.h
+obj/%.o: $(SRC_DIR)/%.cpp $(SRC_DIR)/%.h
 	g++ $(AFLAGS) $(OPENMP) $(CFLAGS) -c -o $@ $< $(INC)
 
 clean:
 	rm -f obj/*.o
-	rm -f ../../../lib/libiglboost.a
+	rm -f ../lib/libiglboost.a

build/Makefile_cgal

@@ -3,18 +3,19 @@
 all: libiglcgal
 debug: libiglcgal
 
-include ../../../Makefile.conf
+include Makefile.conf
 all: CFLAGS += -O3 -DNDEBUG 
 debug: CFLAGS += -g -Wall -Werror
 
 .PHONY: libcgal
-libiglcgal: obj ../../../lib/libiglcgal.a
+libiglcgal: obj ../lib/libiglcgal.a
 
-CPP_FILES=$(wildcard *.cpp)
+SRC_DIR=../include/igl/cgal/
+CPP_FILES=$(wildcard $(SRC_DIR)*.cpp)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o)))
 
 # include igl headers
-INC+=-I../../../include/
+INC+=-I../include/
 
 # EXPECTS THAT CFLAGS IS ALREADY SET APPROPRIATELY 
 
@@ -32,13 +33,13 @@ INC+=$(CGAL_INC)
 obj: 
 	mkdir -p obj
 
-../../../lib/libiglcgal.a: $(OBJ_FILES)
+../lib/libiglcgal.a: $(OBJ_FILES)
 	rm -f $@
 	ar cqs $@ $(OBJ_FILES)
 
-obj/%.o: %.cpp %.h
+obj/%.o: $(SRC_DIR)/%.cpp $(SRC_DIR)/%.h
 	g++ $(AFLAGS) $(CFLAGS) -c -o $@ $< $(INC)
 
 clean:
 	rm -f obj/*.o
-	rm -f ../../../lib/libiglcgal.a
+	rm -f ../lib/libiglcgal.a

build/Makefile_embree

@@ -1,21 +1,22 @@
-include ../../../Makefile.conf
+include Makefile.conf
 
 .PHONY: all
 all: libiglembree
 debug: libiglembree
 
-include ../../../Makefile.conf
+include Makefile.conf
 all: CFLAGS += -O3 -DNDEBUG -std=c++11
 debug: CFLAGS += -g -Wall -std=c++11
 
 .PHONY: libiglembree
-libiglembree: obj ../../../lib/libiglembree.a
+libiglembree: obj ../lib/libiglembree.a
 
-CPP_FILES=$(wildcard *.cpp)
+SRC_DIR=../include/igl/embree/
+CPP_FILES=$(wildcard $(SRC_DIR)*.cpp)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o)))
 
 # include igl headers
-INC+=-I../../../include/
+INC+=-I../include/
 
 # EXPECTS THAT CFLAGS IS ALREADY SET APPROPRIATELY 
 
@@ -24,9 +25,9 @@ EIGEN3_INC=-I$(DEFAULT_PREFIX)/include/eigen3 -I$(DEFAULT_PREFIX)/include/eigen3
 INC+=$(EIGEN3_INC)
 
 # embree dependency
-#EMBREE=../../../external/embree
+#EMBREE=../external/embree
 #EMBREE_INC=-I$(EMBREE)/common -I$(EMBREE)/rtcore/
-EMBREE=../../../external/embree/
+EMBREE=../external/embree/
 EMBREE_INC=-I$(EMBREE)/ -I$(EMBREE)/embree
 #EMBREE_LIB=-L$(EMBREE)/bin -lrtcore -lsys
 INC+=$(EMBREE_INC)
@@ -34,13 +35,13 @@ INC+=$(EMBREE_INC)
 obj: 
 	mkdir -p obj
 
-../../../lib/libiglembree.a: $(OBJ_FILES)
+../lib/libiglembree.a: $(OBJ_FILES)
 	rm -f $@
 	ar cqs $@ $(OBJ_FILES)
 
-obj/%.o: %.cpp %.h
+obj/%.o: $(SRC_DIR)/%.cpp $(SRC_DIR)/%.h
 	g++ $(AFLAGS) $(OPENMP) $(CFLAGS) -c -o $@ $< $(INC)
 
 clean:
 	rm -f obj/*.o
-	rm -f ../../../lib/libiglembree.a
+	rm -f ../lib/libiglembree.a

build/Makefile_matlab

@@ -1,4 +1,4 @@
-include ../../../Makefile.conf
+include Makefile.conf
 all: CFLAGS += -O3 -DNDEBUG
 debug: CFLAGS += -g -Wall -Werror
 
@@ -7,13 +7,14 @@ all: libiglmatlab
 debug: libiglmatlab
 
 .PHONY: libmatlab
-libiglmatlab: obj ../../../lib/libiglmatlab.a
+libiglmatlab: obj ../lib/libiglmatlab.a
 
-CPP_FILES=$(wildcard *.cpp)
+SRC_DIR=../include/igl/matlab/
+CPP_FILES=$(wildcard $(SRC_DIR)*.cpp)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o)))
 
 # include igl headers
-INC+=-I../../../include/
+INC+=-I../include/
 
 # EXPECTS THAT CFLAGS IS ALREADY SET APPROPRIATELY 
 
@@ -33,13 +34,13 @@ INC+=$(MATLAB_INC)
 obj: 
 	mkdir -p obj
 
-../../../lib/libiglmatlab.a: $(OBJ_FILES)
+../lib/libiglmatlab.a: $(OBJ_FILES)
 	rm -f $@
 	ar cqs $@ $(OBJ_FILES)
 
-obj/%.o: %.cpp %.h
+obj/%.o: $(SRC_DIR)/%.cpp $(SRC_DIR)/%.h
 	g++ $(AFLAGS) $(CFLAGS) -c -o $@ $< $(INC)
 
 clean:
 	rm -f obj/*.o
-	rm -f ../../../lib/libiglmatlab.a
+	rm -f ../lib/libiglmatlab.a

build/Makefile_mosek

@@ -1,22 +1,23 @@
-include ../../../Makefile.conf
+include Makefile.conf
 
 .PHONY: all
 all: libiglmosek
 debug: libiglmosek
 
-include ../../../Makefile.conf
+include Makefile.conf
 all: OPTFLAGS += -O3 -DNDEBUG $(OPENMP)
 debug: OPTFLAGS += -g -Wall
 CFLAGS += $(OPTFLAGS)
 
 .PHONY: libiglmosek
-libiglmosek: obj ../../../lib/libiglmosek.a
+libiglmosek: obj ../lib/libiglmosek.a
 
-CPP_FILES=$(wildcard *.cpp)
+SRC_DIR=../include/igl/mosek/
+CPP_FILES=$(wildcard $(SRC_DIR)*.cpp)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o)))
 
 # include igl headers
-INC+=-I../../../include/
+INC+=-I../include/
 
 # EXPECTS THAT CFLAGS IS ALREADY SET APPROPRIATELY 
 
@@ -40,13 +41,13 @@ INC+=$(MOSEK_INC)
 obj: 
 	mkdir -p obj
 
-../../../lib/libiglmosek.a: $(OBJ_FILES)
+../lib/libiglmosek.a: $(OBJ_FILES)
 	rm -f $@
 	ar cqs $@ $(OBJ_FILES)
 
-obj/%.o: %.cpp %.h
+obj/%.o: $(SRC_DIR)/%.cpp $(SRC_DIR)/%.h
 	g++ $(AFLAGS) $(CFLAGS) -c -o $@ $< $(INC)
 
 clean:
 	rm -f obj/*.o
-	rm -f ../../../lib/libiglmosek.a
+	rm -f ../lib/libiglmosek.a

build/Makefile_png

@@ -1,4 +1,4 @@
-include ../../../Makefile.conf
+include Makefile.conf
 all: CFLAGS += -O3 -DNDEBUG 
 debug: CFLAGS += -g -Wall -Werror
 
@@ -7,18 +7,19 @@ all: libiglpng
 debug: libiglpng
 
 .PHONY: libpng
-libiglpng: obj ../../../lib/libiglpng.a
+libiglpng: obj ../lib/libiglpng.a
 
-CPP_FILES=$(wildcard *.cpp)
+SRC_DIR=../include/igl/png/
+CPP_FILES=$(wildcard $(SRC_DIR)*.cpp)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o)))
 
 # include igl headers
-INC+=-I../../../include/
+INC+=-I../include/
 
 # EXPECTS THAT CFLAGS IS ALREADY SET APPROPRIATELY 
 
 # YIMG dependency
-YIMG=../../../external/yimg
+YIMG=../external/yimg
 YIMG_INC=-I$(YIMG)
 INC+=$(YIMG_INC)
 YIMG_STATIC_LIB=$(YIMG)/libyimg.a
@@ -29,13 +30,13 @@ INC+=-I/opt/local/include/
 obj: 
 	mkdir -p obj
 
-../../../lib/libiglpng.a: $(OBJ_FILES)
+../lib/libiglpng.a: $(OBJ_FILES)
 	rm -f $@
 	ar cqs $@ $(OBJ_FILES)
 
-obj/%.o: %.cpp %.h
+obj/%.o: $(SRC_DIR)/%.cpp $(SRC_DIR)/%.h
 	g++ $(AFLAGS) $(CFLAGS) -c -o $@ $< $(INC)
 
 clean:
 	rm -f obj/*.o
-	rm -f ../../../lib/libiglpng.a
+	rm -f ../lib/libiglpng.a

build/Makefile_svd3x3

@@ -1,28 +1,28 @@
-include ../../../Makefile.conf
+include Makefile.conf
 
 .PHONY: all
 all: libiglsvd3x3
 debug: libiglsvd3x3
 
-include ../../../Makefile.conf
+include Makefile.conf
 all: OPTFLAGS += -O3 -DNDEBUG $(OPENMP)
 debug: OPTFLAGS += -g -Wall
 CFLAGS += $(OPTFLAGS) -std=c++11
 
 .PHONY: libiglsvd3x3
-libiglsvd3x3: obj ../../../lib/libiglsvd3x3.a
+libiglsvd3x3: obj ../lib/libiglsvd3x3.a
 
-CPP_FILES=$(wildcard *.cpp)
+CPP_FILES=$(wildcard ../include/igl/svd3x3/*.cpp)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o)))
 
 # include igl headers
-INC+=-I../../../include/
+INC+=-I../include/
 
 # EXPECTS THAT CFLAGS IS ALREADY SET APPROPRIATELY 
 
 # SVD 
 SINGULAR_VALUE_DECOMPOSITION_INC=\
-	-I../../../external/Singular_Value_Decomposition/
+	-I../external/Singular_Value_Decomposition/
 # Eigen dependency
 EIGEN3_INC=-I$(DEFAULT_PREFIX)/include/eigen3 -I$(DEFAULT_PREFIX)/include/eigen3/unsupported
 INC+=$(EIGEN3_INC) $(SINGULAR_VALUE_DECOMPOSITION_INC)
@@ -39,13 +39,13 @@ INC+=$(MATLAB_INC)
 obj: 
 	mkdir -p obj
 
-../../../lib/libiglsvd3x3.a: $(OBJ_FILES)
+../lib/libiglsvd3x3.a: $(OBJ_FILES)
 	rm -f $@
 	ar cqs $@ $(OBJ_FILES)
 
-obj/%.o: %.cpp %.h
+obj/%.o: $(SRC_DIR)/%.cpp $(SRC_DIR)/%.h
 	$(GG) $(AFLAGS) $(CFLAGS) -c -o $@ $< $(INC)
 
 clean:
 	rm -f obj/*.o
-	rm -f ../../../lib/libiglsvd3x3.a
+	rm -f ../lib/libiglsvd3x3.a

build/Makefile_tetgen

@@ -3,18 +3,19 @@
 all: libigltetgen
 debug: libigltetgen
 
-include ../../../Makefile.conf
+include Makefile.conf
 all: CFLAGS += -O3 -DNDEBUG 
 debug: CFLAGS += -g -Wall -Werror
 
 .PHONY: libtetgen
-libigltetgen: obj ../../../lib/libigltetgen.a
+libigltetgen: obj ../lib/libigltetgen.a
 
-CPP_FILES=$(wildcard *.cpp)
+SRC_DIR=../include/igl/tetgen/
+CPP_FILES=$(wildcard $(SRC_DIR)*.cpp)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o)))
 
 # include igl headers
-INC+=-I../../../include/
+INC+=-I../include/
 
 # EXPECTS THAT CFLAGS IS ALREADY SET APPROPRIATELY 
 
@@ -23,7 +24,7 @@ EIGEN3_INC=-I$(DEFAULT_PREFIX)/include/eigen3 -I$(DEFAULT_PREFIX)/include/eigen3
 INC+=$(EIGEN3_INC)
 
 # Tetgen dependency
-TETGEN=../../../external/tetgen
+TETGEN=../external/tetgen
 TETGEN_INC=-I$(TETGEN)
 INC+=$(TETGEN_INC)
 TETGEN_STATIC_LIB=$(TETGEN)/libtet.a
@@ -31,13 +32,13 @@ TETGEN_STATIC_LIB=$(TETGEN)/libtet.a
 obj: 
 	mkdir -p obj
 
-../../../lib/libigltetgen.a: $(OBJ_FILES)
+../lib/libigltetgen.a: $(OBJ_FILES)
 	rm -f $@
 	ar cqs $@ $(OBJ_FILES)
 
-obj/%.o: %.cpp %.h
+obj/%.o: $(SRC_DIR)/%.cpp $(SRC_DIR)/%.h
 	g++ $(AFLAGS) $(CFLAGS) -c -o $@ $< $(INC)
 
 clean:
 	rm -f obj/*.o
-	rm -f ../../../lib/libigltetgen.a
+	rm -f ../lib/libigltetgen.a

build/Makefile_viewer

@@ -1,4 +1,4 @@
-include ../../../Makefile.conf
+include Makefile.conf
 all: CFLAGS += -O3 -DNDEBUG -fopenmp
 debug: CFLAGS += -g -Wall -Werror -fopenmp
 
@@ -7,13 +7,14 @@ all: libiglviewer
 debug: libiglviewer
 
 .PHONY: libviewer
-libiglviewer: obj ../../../lib/libiglviewer.a
+libiglviewer: obj ../lib/libiglviewer.a
 
-CPP_FILES=$(wildcard *.cpp)
+SRC_DIR=../include/igl/viewer/
+CPP_FILES=$(wildcard $(SRC_DIR)*.cpp)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o)))
 
 # include igl headers
-INC+=-I../../../include/
+INC+=-I../include/
 
 # EXPECTS THAT CFLAGS IS ALREADY SET APPROPRIATELY 
 
@@ -23,12 +24,12 @@ INC+=$(EIGEN3_INC)
 
 # GLFW dependency
 ifndef GLFW
-	GLFW=../../../external/glfw/
+	GLFW=../external/glfw/
 endif
 GLFW_INC=-I$(GLFW)/include
 INC+=$(GLFW_INC)
 ifndef ANTTWEAKBAR
-	ANTTWEAKBAR=../../../external/AntTweakBar/
+	ANTTWEAKBAR=../external/AntTweakBar/
 endif
 # Viewer also uses source files from AntTweakBar for font rendering
 ANTTWEAKBAR_INC=-I$(ANTTWEAKBAR)/include -I$(ANTTWEAKBAR)/src
@@ -37,13 +38,13 @@ INC+=$(ANTTWEAKBAR_INC)
 obj: 
 	mkdir -p obj
 
-../../../lib/libiglviewer.a: $(OBJ_FILES)
+../lib/libiglviewer.a: $(OBJ_FILES)
 	rm -f $@
 	ar cqs $@ $(OBJ_FILES)
 
-obj/%.o: %.cpp %.h
+obj/%.o: $(SRC_DIR)/%.cpp $(SRC_DIR)/%.h
 	g++ $(AFLAGS) $(CFLAGS) -c -o $@ $< $(INC)
 
 clean:
 	rm -f obj/*.o
-	rm -f ../../../lib/libiglmatlab.a
+	rm -f ../lib/libiglmatlab.a

build/Makefile_xml

@@ -1,4 +1,4 @@
-include ../../../Makefile.conf
+include Makefile.conf
 
 .PHONY: all
 all: 
@@ -6,18 +6,19 @@ debug:
 #all: libiglxml
 #debug: libiglxml
 
-include ../../../Makefile.conf
+include Makefile.conf
 all: CFLAGS += -O3 -DNDEBUG
 debug: CFLAGS += -g -Wall
 
 .PHONY: libiglxml
-libiglxml: obj ../../../lib/libiglxml.a
+libiglxml: obj ../lib/libiglxml.a
 
-CPP_FILES=$(wildcard *.cpp)
+SRC_DIR=../include/igl/xml/
+CPP_FILES=$(wildcard $(SRC_DIR)*.cpp)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o)))
 
 # include igl headers
-INC+=-I../../../include/
+INC+=-I../include/
 
 # EXPECTS THAT CFLAGS IS ALREADY SET APPROPRIATELY 
 
@@ -26,17 +27,17 @@ EIGEN3_INC=-I$(DEFAULT_PREFIX)/include/eigen3 -I$(DEFAULT_PREFIX)/include/eigen3
 INC+=$(EIGEN3_INC)
 
 #AntTweakbar dependency
-ANTTWEAKBAR_INC=-I../../../external/AntTweakBar/include
+ANTTWEAKBAR_INC=-I../external/AntTweakBar/include
 
 # xml dependency
 # TODO: linux, 32 bit etc
-TINYXML2=../../../external/tinyxml2
+TINYXML2=../external/tinyxml2
 TINYXML2_INC=-I$(TINYXML2)
 #TINYXML2_LIB=-L$(TINYXML2) -ltinyxml2
 INC+=$(TINYXML2_INC) $(ANTTWEAKBAR_INC)
 
 # AntTweakBar dependency
-ANTTWEAKBAR_INC=-I../../../external/AntTweakBar/include
+ANTTWEAKBAR_INC=-I../external/AntTweakBar/include
 INC+=$(ANTTWEAKBAR_INC)
 
 #CFLAGS+=-std=c++11
@@ -44,13 +45,13 @@ INC+=$(ANTTWEAKBAR_INC)
 obj: 
 	mkdir -p obj
 
-../../../lib/libiglxml.a: $(OBJ_FILES)
+../lib/libiglxml.a: $(OBJ_FILES)
 	rm -f $@
 	ar cqs $@ $(OBJ_FILES)
 
-obj/%.o: %.cpp %.h
+obj/%.o: $(SRC_DIR)/%.cpp $(SRC_DIR)/%.h
 	g++ $(AFLAGS) $(CFLAGS) -c -o $@ $< $(INC)
 
 clean:
 	rm -f obj/*.o
-	rm -f ../../../lib/libiglxml.a
+	rm -f ../lib/libiglxml.a