diff --git a/.gitignore b/.gitignore index 7da14c318b06..835098747abc 100644 --- a/.gitignore +++ b/.gitignore @@ -177,7 +177,6 @@ apps/*/passes.txt apps/*/*.ll apps/*/*.sass apps/*/filter -apps/interpolate/interpolate apps/seam_carving/seam_carving.h apps/snake/halide_snake apps/HelloAndroid*/bin diff --git a/Makefile b/Makefile index 0f926c6b1d16..f16b9583140c 100644 --- a/Makefile +++ b/Makefile @@ -1149,7 +1149,7 @@ test_apps: $(LIB_DIR)/libHalide.a $(BIN_DIR)/libHalide.$(SHARED_EXT) $(INCLUDE_D make -C apps/local_laplacian clean HALIDE_BIN_PATH=$(CURDIR) HALIDE_SRC_PATH=$(ROOT_DIR) make -C apps/local_laplacian bin/out.png HALIDE_BIN_PATH=$(CURDIR) HALIDE_SRC_PATH=$(ROOT_DIR) make -C apps/interpolate clean HALIDE_BIN_PATH=$(CURDIR) HALIDE_SRC_PATH=$(ROOT_DIR) - make -C apps/interpolate out.png HALIDE_BIN_PATH=$(CURDIR) HALIDE_SRC_PATH=$(ROOT_DIR) + make -C apps/interpolate bin/out.png HALIDE_BIN_PATH=$(CURDIR) HALIDE_SRC_PATH=$(ROOT_DIR) make -C apps/blur clean HALIDE_BIN_PATH=$(CURDIR) HALIDE_SRC_PATH=$(ROOT_DIR) make -C apps/blur bin/test HALIDE_BIN_PATH=$(CURDIR) HALIDE_SRC_PATH=$(ROOT_DIR) apps/blur/bin/test diff --git a/apps/interpolate/.gitignore b/apps/interpolate/.gitignore deleted file mode 100644 index 7138f7baf9c0..000000000000 --- a/apps/interpolate/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -interpolate -out.png diff --git a/apps/interpolate/Makefile b/apps/interpolate/Makefile index baffca2b9214..e730d775d82e 100644 --- a/apps/interpolate/Makefile +++ b/apps/interpolate/Makefile @@ -4,12 +4,13 @@ CXXFLAGS += -g -Wall .PHONY: clean -interpolate: interpolate.cpp - $(CXX) $(CXXFLAGS) interpolate.cpp $(LIB_HALIDE) -o interpolate \ - $(PNGFLAGS) $(LDFLAGS) $(LLVM_SHARED_LIBS) +$(BIN)/interpolate: interpolate.cpp + @-mkdir -p $(BIN) + $(CXX) $(CXXFLAGS) interpolate.cpp $(LIB_HALIDE) -o $@ $(PNGFLAGS) $(LDFLAGS) $(LLVM_SHARED_LIBS) -out.png: interpolate - ./interpolate ../images/rgba.png out.png +$(BIN)/out.png: $(BIN)/interpolate + @-mkdir -p $(BIN) + $^ $(IMAGES)/rgba.png $@ clean: - rm -f interpolate interpolate.h out.png + rm -rf $(BIN)