Merge pull request #630 from 4577/master

Remove BUILDDIR-specific code
This commit is contained in:
Nguyen Anh Quynh 2016-09-04 15:30:49 +08:00 committed by GitHub
commit d59081b073
3 changed files with 0 additions and 18 deletions

View file

@ -213,11 +213,7 @@ else
endif endif
endif endif
ifndef BUILDDIR
@cd samples && $(MAKE) @cd samples && $(MAKE)
else
@cd samples && $(MAKE) BUILDDIR=$(BLDIR)
endif
endif endif
config: config:
@ -337,10 +333,6 @@ ifeq (,$(findstring yes,$(UNICORN_BUILD_CORE_ONLY)))
endif endif
$(MAKE) -C tests/unit clean $(MAKE) -C tests/unit clean
ifdef BUILDDIR
rm -rf $(BUILDDIR)
endif
define generate-pkgcfg define generate-pkgcfg
echo 'Name: unicorn' > $(PKGCFGF) echo 'Name: unicorn' > $(PKGCFGF)

View file

@ -1,10 +1,6 @@
# Python binding for Unicorn engine. Nguyen Anh Quynh <aquynh@gmail.com> # Python binding for Unicorn engine. Nguyen Anh Quynh <aquynh@gmail.com>
ifndef BUILDDIR
OBJDIR = ./build OBJDIR = ./build
else
OBJDIR = $(abspath $(BUILDDIR))/obj/bindings/python
endif
.PHONY: gen_const install install3 clean .PHONY: gen_const install install3 clean

View file

@ -16,15 +16,9 @@ UNICORN_DEP_LIBS_STATIC += -lpthread -lm $(GLIB)
V ?= 0 V ?= 0
INCDIR = ../include INCDIR = ../include
ifndef BUILDDIR
SAMPLEDIR = . SAMPLEDIR = .
OBJDIR = . OBJDIR = .
LIBDIR = .. LIBDIR = ..
else
SAMPLEDIR = $(BUILDDIR)/samples
OBJDIR = $(BUILDDIR)/obj/samples
LIBDIR = $(BUILDDIR)
endif
CFLAGS += -Wall -I$(INCDIR) CFLAGS += -Wall -I$(INCDIR)
LDFLAGS += -lpthread -L$(LIBDIR) -l$(LIBNAME) LDFLAGS += -lpthread -L$(LIBDIR) -l$(LIBNAME)