Make pkg-config and source consistent with installation

MCInst.h

@@ -21,7 +21,7 @@
 
 #include <stdint.h>
 
-#include "include/capstone.h"
+#include "include/capstone/capstone.h"
 
 typedef struct MCInst MCInst;
 typedef struct cs_struct cs_struct;

MCInstrDesc.h

@@ -19,7 +19,7 @@
 #define CS_LLVM_MC_MCINSTRDESC_H
 
 #include <stdint.h>
-#include "include/platform.h"
+#include "capstone/platform.h"
 
 //===----------------------------------------------------------------------===//
 // Machine Operand Flags and Description

MCRegisterInfo.h

@@ -20,7 +20,7 @@
 #define CS_LLVM_MC_MCREGISTERINFO_H
 
 #include <stdint.h>
-#include "include/platform.h"
+#include "capstone/platform.h"
 
 /// An unsigned integer type large enough to represent all physical registers,
 /// but not necessarily virtual registers.

Makefile

@@ -237,7 +237,7 @@ LIBOBJ += $(OBJDIR)/MCInst.o
 
 
 PKGCFGDIR ?= $(LIBDATADIR)/pkgconfig
-API_MAJOR=$(shell echo `grep -e CS_API_MAJOR include/capstone.h | grep -v = | awk '{print $$3}'` | awk '{print $$1}')
+API_MAJOR=$(shell echo `grep -e CS_API_MAJOR include/capstone/capstone.h | grep -v = | awk '{print $$3}'` | awk '{print $$1}')
 VERSION_EXT =
 
 IS_APPLE := $(shell $(CC) -dM -E - < /dev/null | grep __apple_build_version__ | wc -l | tr -d " ")
@@ -373,7 +373,7 @@ ifeq ($(CAPSTONE_STATIC),yes)
 	$(INSTALL_DATA) $(ARCHIVE) $(LIBDIR)
 endif
 	mkdir -p $(INCDIR)/$(LIBNAME)
-	$(INSTALL_DATA) include/*.h $(INCDIR)/$(LIBNAME)
+	$(INSTALL_DATA) include/capstone/*.h $(INCDIR)/$(LIBNAME)
 	mkdir -p $(PKGCFGDIR)
 	$(INSTALL_DATA) $(PKGCFGF) $(PKGCFGDIR)/
 
@@ -453,7 +453,7 @@ define generate-pkgcfg
 	echo 'Description: Capstone disassembly engine' >> $(PKGCFGF)
 	echo 'Version: $(PKG_VERSION)' >> $(PKGCFGF)
 	echo 'libdir=$(LIBDIR)' >> $(PKGCFGF)
-	echo 'includedir=$(INCDIR)/capstone' >> $(PKGCFGF)
+	echo 'includedir=$(INCDIR)' >> $(PKGCFGF)
 	echo 'archive=$${libdir}/libcapstone.a' >> $(PKGCFGF)
 	echo 'Libs: -L$${libdir} -lcapstone' >> $(PKGCFGF)
 	echo 'Cflags: -I$${includedir}' >> $(PKGCFGF)

arch/AArch64/AArch64Disassembler.h

@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 
-#include "../../include/capstone.h"
+#include "capstone/capstone.h"
 #include "../../MCRegisterInfo.h"
 #include "../../MCInst.h"
 

arch/AArch64/AArch64Mapping.h

@@ -4,7 +4,7 @@
 #ifndef CS_ARM64_MAP_H
 #define CS_ARM64_MAP_H
 
-#include "../../include/capstone.h"
+#include "capstone/capstone.h"
 
 // return name of regiser in friendly string
 const char *AArch64_reg_name(csh handle, unsigned int reg);

arch/ARM/ARMAddressingModes.h

@@ -17,7 +17,7 @@
 #ifndef CS_LLVM_TARGET_ARM_ARMADDRESSINGMODES_H
 #define CS_LLVM_TARGET_ARM_ARMADDRESSINGMODES_H
 
-#include "../../include/platform.h"
+#include "capstone/platform.h"
 #include "../../MathExtras.h"
 
 /// ARM_AM - ARM Addressing Mode Stuff

arch/ARM/ARMBaseInfo.h

@@ -20,7 +20,7 @@
 #ifndef CS_ARMBASEINFO_H
 #define CS_ARMBASEINFO_H
 
-#include "../../include/arm.h"
+#include "capstone/arm.h"
 
 // Defines symbolic names for ARM registers.  This defines a mapping from
 // register name to register number.

arch/ARM/ARMDisassembler.h

@@ -4,7 +4,7 @@
 #ifndef CS_ARMDISASSEMBLER_H
 #define CS_ARMDISASSEMBLER_H
 
-#include "../../include/capstone.h"
+#include "capstone/capstone.h"
 #include "../../MCRegisterInfo.h"
 
 void ARM_init(MCRegisterInfo *MRI);

arch/ARM/ARMMapping.h

@@ -4,7 +4,7 @@
 #ifndef CS_ARM_MAP_H
 #define CS_ARM_MAP_H
 
-#include "../../include/capstone.h"
+#include "../../include/capstone/capstone.h"
 #include "../../utils.h"
 
 // return name of regiser in friendly string

arch/Mips/MipsDisassembler.h

@@ -4,9 +4,7 @@
 #ifndef CS_MIPSDISASSEMBLER_H
 #define CS_MIPSDISASSEMBLER_H
 
-#include "../../include/capstone.h"
-
-#include "../../include/capstone.h"
+#include "capstone/capstone.h"
 #include "../../MCRegisterInfo.h"
 
 void Mips_init(MCRegisterInfo *MRI);

arch/Mips/MipsMapping.h

@@ -4,7 +4,7 @@
 #ifndef CS_MIPS_MAP_H
 #define CS_MIPS_MAP_H
 
-#include "../../include/capstone.h"
+#include "capstone/capstone.h"
 
 // return name of regiser in friendly string
 const char *Mips_reg_name(csh handle, unsigned int reg);

arch/PowerPC/PPCDisassembler.h

@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 
-#include "../../include/capstone.h"
+#include "capstone/capstone.h"
 #include "../../MCRegisterInfo.h"
 #include "../../MCInst.h"
 

arch/PowerPC/PPCMapping.h

@@ -4,7 +4,7 @@
 #ifndef CS_PPC_MAP_H
 #define CS_PPC_MAP_H
 
-#include "../../include/capstone.h"
+#include "capstone/capstone.h"
 
 // return name of regiser in friendly string
 const char *PPC_reg_name(csh handle, unsigned int reg);

arch/PowerPC/PPCPredicates.h

@@ -17,7 +17,7 @@
 #ifndef CS_POWERPC_PPCPREDICATES_H
 #define CS_POWERPC_PPCPREDICATES_H
 
-#include "../../include/ppc.h"
+#include "capstone/ppc.h"
 
 // NOTE: duplicate of ppc_bc in ppc.h to maitain code compatibility with LLVM
 typedef enum ppc_predicate {

arch/Sparc/Sparc.h

@@ -18,7 +18,7 @@
 #ifndef CS_SPARC_TARGET_SPARC_H
 #define CS_SPARC_TARGET_SPARC_H
 
-#include "../../include/sparc.h"
+#include "capstone/sparc.h"
 
 inline static char *SPARCCondCodeToString(sparc_cc CC)
 {

arch/Sparc/SparcDisassembler.h

@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 
-#include "../../include/capstone.h"
+#include "capstone/capstone.h"
 #include "../../MCRegisterInfo.h"
 #include "../../MCInst.h"
 

arch/Sparc/SparcMapping.h

@@ -4,7 +4,7 @@
 #ifndef CS_SPARC_MAP_H
 #define CS_SPARC_MAP_H
 
-#include "../../include/capstone.h"
+#include "capstone/capstone.h"
 
 // return name of regiser in friendly string
 const char *Sparc_reg_name(csh handle, unsigned int reg);

arch/SystemZ/SystemZDisassembler.h

@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 
-#include "../../include/capstone.h"
+#include "capstone/capstone.h"
 #include "../../MCRegisterInfo.h"
 #include "../../MCInst.h"
 

arch/SystemZ/SystemZMapping.h

@@ -4,7 +4,7 @@
 #ifndef CS_SYSZ_MAP_H
 #define CS_SYSZ_MAP_H
 
-#include "../../include/capstone.h"
+#include "capstone/capstone.h"
 
 // return name of regiser in friendly string
 const char *SystemZ_reg_name(csh handle, unsigned int reg);

arch/X86/X86Disassembler.h

@@ -79,7 +79,7 @@
 
 #include <stdint.h>
 
-#include "../../include/capstone.h"
+#include "capstone/capstone.h"
 
 #include "../../MCInst.h"
 

arch/X86/X86Mapping.h

@@ -4,7 +4,7 @@
 #ifndef CS_X86_MAP_H
 #define CS_X86_MAP_H
 
-#include "../../include/capstone.h"
+#include "capstone/capstone.h"
 #include "../../cs_priv.h"
 
 // map sib_base to x86_reg

arch/XCore/XCoreDisassembler.h

@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 
-#include "../../include/capstone.h"
+#include "capstone/capstone.h"
 #include "../../MCRegisterInfo.h"
 #include "../../MCInst.h"
 

arch/XCore/XCoreMapping.h

@@ -4,7 +4,7 @@
 #ifndef CS_XCORE_MAP_H
 #define CS_XCORE_MAP_H
 
-#include "../../include/capstone.h"
+#include "capstone/capstone.h"
 
 // return name of regiser in friendly string
 const char *XCore_reg_name(csh handle, unsigned int reg);

bindings/ocaml/ocaml.c

@@ -8,7 +8,7 @@
 #include <caml/alloc.h>
 #include <caml/fail.h>
 
-#include "../../include/capstone.h"
+#include "capstone/capstone.h"
 
 #define ARR_SIZE(a) (sizeof(a)/sizeof(a[0]))
 

cs.c

@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <capstone.h>
+#include <capstone/capstone.h>
 
 #include "utils.h"
 #include "MCRegisterInfo.h"

cs_priv.h

@@ -4,7 +4,7 @@
 #ifndef CS_PRIV_H
 #define CS_PRIV_H
 
-#include <capstone.h>
+#include <capstone/capstone.h>
 
 #include "MCInst.h"
 #include "SStream.h"

tests/test.c

@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include "../inttypes.h"
 
-#include <capstone.h>
+#include <capstone/capstone.h>
 
 struct platform {
 	cs_arch arch;

tests/test_arm.c

@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include "../inttypes.h"
 
-#include <capstone.h>
+#include <capstone/capstone.h>
 
 static csh handle;
 

tests/test_arm64.c

@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include "../inttypes.h"
 
-#include <capstone.h>
+#include <capstone/capstone.h>
 
 static csh handle;
 

tests/test_detail.c

@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include "../inttypes.h"
 
-#include <capstone.h>
+#include <capstone/capstone.h>
 
 struct platform {
 	cs_arch arch;

tests/test_iter.c

@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include "../inttypes.h"
 
-#include <capstone.h>
+#include <capstone/capstone.h>
 
 struct platform {
 	cs_arch arch;

tests/test_mips.c

@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include "../inttypes.h"
 
-#include <capstone.h>
+#include <capstone/capstone.h>
 
 struct platform {
 	cs_arch arch;

tests/test_ppc.c

@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include "../inttypes.h"
 
-#include <capstone.h>
+#include <capstone/capstone.h>
 
 struct platform {
 	cs_arch arch;

tests/test_skipdata.c

@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include "../inttypes.h"
 
-#include <capstone.h>
+#include <capstone/capstone.h>
 
 struct platform {
 	cs_arch arch;

tests/test_sparc.c

@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include "../inttypes.h"
 
-#include <capstone.h>
+#include <capstone/capstone.h>
 
 struct platform {
 	cs_arch arch;

tests/test_systemz.c

@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include "../inttypes.h"
 
-#include <capstone.h>
+#include <capstone/capstone.h>
 
 struct platform {
 	cs_arch arch;

tests/test_x86.c

@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include "../inttypes.h"
 
-#include <capstone.h>
+#include <capstone/capstone.h>
 
 static csh handle;
 

tests/test_xcore.c

@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include "../inttypes.h"
 
-#include <capstone.h>
+#include <capstone/capstone.h>
 
 struct platform {
 	cs_arch arch;

utils.h

@@ -5,7 +5,7 @@
 #define CS_UTILS_H
 
 #include <stddef.h>
-#include "include/capstone.h"
+#include "include/capstone/capstone.h"
 #include "cs_priv.h"
 
 // threshold number, so above this number will be printed in hexa mode