Merge branch 'master' into next

This commit is contained in:
Nguyen Anh Quynh 2018-12-19 11:16:56 +07:00
commit e072cdb6c1
2 changed files with 11 additions and 9 deletions

2
.gitignore vendored
View File

@ -110,6 +110,8 @@ test_arm_regression
test_arm_regression.o
fuzz_harness
test_iter_benchmark
fuzz_bindisasm
fuzz_disasm
*.s

View File

@ -415,23 +415,23 @@ else
endif
install: $(PKGCFGF) $(ARCHIVE) $(LIBRARY)
mkdir -p $(DESTDIR)$(LIBDIR)
$(call install-library,$(DESTDIR)$(LIBDIR))
mkdir -p $(LIBDIR)
$(call install-library,$(LIBDIR))
ifeq ($(CAPSTONE_STATIC),yes)
$(INSTALL_DATA) $(ARCHIVE) $(DESTDIR)$(LIBDIR)
$(INSTALL_DATA) $(ARCHIVE) $(LIBDIR)
endif
mkdir -p $(DESTDIR)$(INCDIR)/$(LIBNAME)
$(INSTALL_DATA) include/capstone/*.h $(DESTDIR)$(INCDIR)/$(LIBNAME)
mkdir -p $(DESTDIR)$(PKGCFGDIR)
$(INSTALL_DATA) $(PKGCFGF) $(DESTDIR)$(PKGCFGDIR)
mkdir -p $(DESTDIR)$(BINDIR)
$(INSTALL_LIB) cstool/cstool $(DESTDIR)$(BINDIR)
mkdir -p $(PKGCFGDIR)
$(INSTALL_DATA) $(PKGCFGF) $(PKGCFGDIR)
mkdir -p $(BINDIR)
$(INSTALL_LIB) cstool/cstool $(BINDIR)
uninstall:
rm -rf $(DESTDIR)$(INCDIR)/$(LIBNAME)
rm -f $(DESTDIR)$(LIBDIR)/lib$(LIBNAME).*
rm -f $(DESTDIR)$(PKGCFGDIR)/$(LIBNAME).pc
rm -f $(DESTDIR)$(BINDIR)/cstool
rm -f $(PKGCFGDIR)/$(LIBNAME).pc
rm -f $(BINDIR)/cstool
clean:
rm -f $(LIBOBJ)