main makefile and example makefiles fixed, Extras are broken

Former-commit-id: e7d7411006a6530bed9db65e8c5bbeab75ac3d3d

Makefile → build/Makefile

@@ -66,9 +66,9 @@ endif
 .PHONY: examples
 .PHONY: extras
 debug: lib extras
-lib: lib/libigl.a
+lib: ../lib/libigl.a
 examples: lib extras
-	make -C examples
+	make -C ../examples
 extras:
 	for p in  $(EXTRA_DIRS); \
 	do \
@@ -80,12 +80,12 @@ extras:
 #############################################################################
 # SOURCE 
 #############################################################################
-CPP_FILES=$(wildcard include/igl/*.cpp)
-H_FILES=$(wildcard include/igl/*.h)
+CPP_FILES=$(wildcard ../include/igl/*.cpp)
+H_FILES=$(wildcard ../include/igl/*.h)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o)))
 
 # include igl headers
-INC+=-Iinclude/
+INC+=-I../include/
 
 #############################################################################
 # DEPENDENCIES
@@ -100,7 +100,7 @@ INC+=$(EIGEN3_INC)
 
 # AntTweakBar dependency
 #ANTTWEAKBAR_INC=-I$(DEFAULT_PREFIX)/include
-ANTTWEAKBAR_INC=-Iexternal/AntTweakBar/include
+ANTTWEAKBAR_INC=-I../external/AntTweakBar/include
 INC+=$(ANTTWEAKBAR_INC)
 
 ## OpenGL dependency
@@ -112,34 +112,34 @@ INC+=$(ANTTWEAKBAR_INC)
 obj: 
 	mkdir -p obj
 
-lib/libigl.a: obj $(OBJ_FILES)
+../lib/libigl.a: obj $(OBJ_FILES)
 	mkdir -p lib
 	rm -f $@
 	ar cqs $@ $(OBJ_FILES)
 
-obj/%.o: include/igl/%.cpp include/igl/%.h
+obj/%.o: ../include/igl/%.cpp ../include/igl/%.h
 	$(GG) $(CFLAGS) $(AFLAGS) -c -o $@ $< $(INC)
 
-lib/igl.framework/:
-	mkdir -p $@
-	cp lib/*.a $@
-	mv $@/libigl.a $@/igl
-	mkdir -p $@/Libraries
-	mv $@/*.a $@/Libraries
-	mkdir -p $@/Headers
-	cp $(H_FILES) $@/Headers
-	for p in $(EXTRAS); \
-	do \
-	mkdir $@/Headers/$$p; \
-	cp include/igl/$$p/*.h $@/Headers/$$p; \
-	done
+#lib/igl.framework/:
+#	mkdir -p $@
+#	cp lib/*.a $@
+#	mv $@/libigl.a $@/igl
+#	mkdir -p $@/Libraries
+#	mv $@/*.a $@/Libraries
+#	mkdir -p $@/Headers
+#	cp $(H_FILES) $@/Headers
+#	for p in $(EXTRAS); \
+#	do \
+#	mkdir $@/Headers/$$p; \
+#	cp include/igl/$$p/*.h $@/Headers/$$p; \
+#	done
 
 
 clean:
-	rm -rf lib/igl.framework/
+	rm -rf ../lib/igl.framework/
 	rm -f obj/*.o
-	rm -f lib/libigl.a
-	make -C examples clean
+	rm -f ../lib/libigl.a
+	make -C ../examples clean
 	for p in  $(EXTRA_DIRS); \
 	do \
 	echo "cd $$p" ; \

examples/MatlabWorkspace/Makefile

@@ -1,7 +1,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 IGL=../../
 IGL_LIB=-L$(IGL)/lib -ligl

examples/ReAntTweakBar/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/affine/Makefile

@@ -4,7 +4,7 @@
 all: example
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 .PHONY: example
 

examples/ambient-occlusion/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/arap/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/basic_topology/Makefile

@@ -2,7 +2,7 @@
 all: example1
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 igl_lib=../../
 eigen_lib=$(DEFAULT_PREFIX)/include/eigen3/

examples/bbw/Makefile

@@ -1,4 +1,4 @@
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 CXX=g++
 

examples/beach-balls/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: obj example
 

examples/camera/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: obj example
 

examples/cat/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/colored-mesh/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/dmat/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/eigen-gotchas/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/embree/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/example_fun/Makefile

@@ -3,7 +3,7 @@
 all: example_static example_header_only
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 igl_lib=../../
 

examples/file_contents_as_string/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/flare-eyes/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: obj example
 

examples/get_seconds/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/glslversion/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/glut_speed_test/Makefile

@@ -4,7 +4,7 @@
 all: example
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 .PHONY: example
 

examples/harwell_boeing/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/intersections/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/is_dir/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/marching_cubes/Makefile

@@ -6,7 +6,7 @@ all: example
 .PHONY: example
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 igl_lib=../../
 eigen=-I$(DEFAULT_PREFIX)/include/eigen3

examples/meshio/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/mode/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/multi-viewport/Makefile

@@ -8,7 +8,7 @@ all: example
 .PHONY:  example
 
 LIBIGL=/usr/local/igl/libigl/
-include $(LIBIGL)/Makefile.conf
+include $(LIBIGL)/build/Makefile.conf
 LIBIGL_INC=-I$(LIBIGL)/include
 LIBIGL_LIB=-L$(LIBIGL)/lib -ligl -liglembree
 

examples/patches/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: obj example
 

examples/path_tests/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/pathinfo/Makefile

@@ -4,7 +4,7 @@
 all: example
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 .PHONY: example
 

examples/principal_curvature/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: curvature
 

examples/randomly-sample-mesh/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: obj example
 

examples/render_to_png/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 # YIMG dependency
 YIMG=../../external/yimg

examples/rotate-widget/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: obj example
 

examples/scene-rotation/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: obj example
 

examples/shadow-mapping/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: obj example
 

examples/skeleton/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: obj example
 

examples/slice/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/sort/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/sortrows/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/stdin_to_temp/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/svd/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/textured-mesh/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/trackball/Makefile

@@ -4,7 +4,7 @@
 all: example
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 .PHONY: example
 

examples/transparency/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/transpose_blocks/Makefile

@@ -2,7 +2,7 @@
 .PHONY: all
 
 # Shared flags etc.
-include ../../Makefile.conf
+include ../../build/Makefile.conf
 
 all: example
 

examples/upright/Makefile

@@ -8,7 +8,7 @@ all: upright
 .PHONY: upright
 
 LIBIGL=/usr/local/igl/libigl/
-include $(LIBIGL)/Makefile.conf
+include $(LIBIGL)/build/Makefile.conf
 LIBIGL_INC=-I$(LIBIGL)/include
 LIBIGL_LIB=-L$(LIBIGL)/lib -ligl