From 1f978de447911d90474dbbe3b2a18f440ad93524 Mon Sep 17 00:00:00 2001 From: 4577 <4577@example.com> Date: Sun, 4 Sep 2016 08:59:31 +0200 Subject: [PATCH] Remove BUILDDIR-specific code --- Makefile | 8 -------- bindings/python/Makefile | 4 ---- samples/Makefile | 6 ------ 3 files changed, 18 deletions(-) diff --git a/Makefile b/Makefile index 328ee1a0..880dfc93 100644 --- a/Makefile +++ b/Makefile @@ -213,11 +213,7 @@ else endif endif -ifndef BUILDDIR @cd samples && $(MAKE) -else - @cd samples && $(MAKE) BUILDDIR=$(BLDIR) -endif endif config: @@ -337,10 +333,6 @@ ifeq (,$(findstring yes,$(UNICORN_BUILD_CORE_ONLY))) endif $(MAKE) -C tests/unit clean -ifdef BUILDDIR - rm -rf $(BUILDDIR) -endif - define generate-pkgcfg echo 'Name: unicorn' > $(PKGCFGF) diff --git a/bindings/python/Makefile b/bindings/python/Makefile index cc6c7c6d..d1c40d29 100644 --- a/bindings/python/Makefile +++ b/bindings/python/Makefile @@ -1,10 +1,6 @@ # Python binding for Unicorn engine. Nguyen Anh Quynh -ifndef BUILDDIR OBJDIR = ./build -else -OBJDIR = $(abspath $(BUILDDIR))/obj/bindings/python -endif .PHONY: gen_const install install3 clean diff --git a/samples/Makefile b/samples/Makefile index 15030da8..a1916b76 100644 --- a/samples/Makefile +++ b/samples/Makefile @@ -16,15 +16,9 @@ UNICORN_DEP_LIBS_STATIC += -lpthread -lm $(GLIB) V ?= 0 INCDIR = ../include -ifndef BUILDDIR SAMPLEDIR = . OBJDIR = . LIBDIR = .. -else -SAMPLEDIR = $(BUILDDIR)/samples -OBJDIR = $(BUILDDIR)/obj/samples -LIBDIR = $(BUILDDIR) -endif CFLAGS += -Wall -I$(INCDIR) LDFLAGS += -lpthread -L$(LIBDIR) -l$(LIBNAME)