From 9c10ace558d4cc5d7f973ac301323392598d3f20 Mon Sep 17 00:00:00 2001 From: pancake Date: Tue, 24 Feb 2015 04:55:55 +0100 Subject: [PATCH] Make pkg-config and source consistent with installation --- MCInst.h | 2 +- MCInstrDesc.h | 2 +- MCRegisterInfo.h | 2 +- Makefile | 6 +++--- arch/AArch64/AArch64Disassembler.h | 2 +- arch/AArch64/AArch64Mapping.h | 2 +- arch/ARM/ARMAddressingModes.h | 2 +- arch/ARM/ARMBaseInfo.h | 2 +- arch/ARM/ARMDisassembler.h | 2 +- arch/ARM/ARMMapping.h | 2 +- arch/Mips/MipsDisassembler.h | 4 +--- arch/Mips/MipsMapping.h | 2 +- arch/PowerPC/PPCDisassembler.h | 2 +- arch/PowerPC/PPCMapping.h | 2 +- arch/PowerPC/PPCPredicates.h | 2 +- arch/Sparc/Sparc.h | 2 +- arch/Sparc/SparcDisassembler.h | 2 +- arch/Sparc/SparcMapping.h | 2 +- arch/SystemZ/SystemZDisassembler.h | 2 +- arch/SystemZ/SystemZMapping.h | 2 +- arch/X86/X86Disassembler.h | 2 +- arch/X86/X86Mapping.h | 2 +- arch/XCore/XCoreDisassembler.h | 2 +- arch/XCore/XCoreMapping.h | 2 +- bindings/ocaml/ocaml.c | 2 +- cs.c | 2 +- cs_priv.h | 2 +- include/{ => capstone}/arm.h | 0 include/{ => capstone}/arm64.h | 0 include/{ => capstone}/capstone.h | 0 include/{ => capstone}/mips.h | 0 include/{ => capstone}/platform.h | 0 include/{ => capstone}/ppc.h | 0 include/{ => capstone}/sparc.h | 0 include/{ => capstone}/systemz.h | 0 include/{ => capstone}/x86.h | 0 include/{ => capstone}/xcore.h | 0 tests/test.c | 2 +- tests/test_arm.c | 2 +- tests/test_arm64.c | 2 +- tests/test_detail.c | 2 +- tests/test_iter.c | 2 +- tests/test_mips.c | 2 +- tests/test_ppc.c | 2 +- tests/test_skipdata.c | 2 +- tests/test_sparc.c | 2 +- tests/test_systemz.c | 2 +- tests/test_x86.c | 2 +- tests/test_xcore.c | 2 +- utils.h | 2 +- 50 files changed, 42 insertions(+), 44 deletions(-) rename include/{ => capstone}/arm.h (100%) rename include/{ => capstone}/arm64.h (100%) rename include/{ => capstone}/capstone.h (100%) rename include/{ => capstone}/mips.h (100%) rename include/{ => capstone}/platform.h (100%) rename include/{ => capstone}/ppc.h (100%) rename include/{ => capstone}/sparc.h (100%) rename include/{ => capstone}/systemz.h (100%) rename include/{ => capstone}/x86.h (100%) rename include/{ => capstone}/xcore.h (100%) diff --git a/MCInst.h b/MCInst.h index bef8c266d..5a03cbe65 100644 --- a/MCInst.h +++ b/MCInst.h @@ -21,7 +21,7 @@ #include -#include "include/capstone.h" +#include "include/capstone/capstone.h" typedef struct MCInst MCInst; typedef struct cs_struct cs_struct; diff --git a/MCInstrDesc.h b/MCInstrDesc.h index ae94b4f7a..a053536b9 100644 --- a/MCInstrDesc.h +++ b/MCInstrDesc.h @@ -19,7 +19,7 @@ #define CS_LLVM_MC_MCINSTRDESC_H #include -#include "include/platform.h" +#include "capstone/platform.h" //===----------------------------------------------------------------------===// // Machine Operand Flags and Description diff --git a/MCRegisterInfo.h b/MCRegisterInfo.h index 58c2f2d91..f1fd172a3 100644 --- a/MCRegisterInfo.h +++ b/MCRegisterInfo.h @@ -20,7 +20,7 @@ #define CS_LLVM_MC_MCREGISTERINFO_H #include -#include "include/platform.h" +#include "capstone/platform.h" /// An unsigned integer type large enough to represent all physical registers, /// but not necessarily virtual registers. diff --git a/Makefile b/Makefile index 15c06badc..f226a6dbd 100644 --- a/Makefile +++ b/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) diff --git a/arch/AArch64/AArch64Disassembler.h b/arch/AArch64/AArch64Disassembler.h index 0f84c8583..13626015a 100644 --- a/arch/AArch64/AArch64Disassembler.h +++ b/arch/AArch64/AArch64Disassembler.h @@ -6,7 +6,7 @@ #include -#include "../../include/capstone.h" +#include "capstone/capstone.h" #include "../../MCRegisterInfo.h" #include "../../MCInst.h" diff --git a/arch/AArch64/AArch64Mapping.h b/arch/AArch64/AArch64Mapping.h index 69edef929..2683c094b 100644 --- a/arch/AArch64/AArch64Mapping.h +++ b/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); diff --git a/arch/ARM/ARMAddressingModes.h b/arch/ARM/ARMAddressingModes.h index 6d46ea736..9a0f4d214 100644 --- a/arch/ARM/ARMAddressingModes.h +++ b/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 diff --git a/arch/ARM/ARMBaseInfo.h b/arch/ARM/ARMBaseInfo.h index 971b77470..d646802d0 100644 --- a/arch/ARM/ARMBaseInfo.h +++ b/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. diff --git a/arch/ARM/ARMDisassembler.h b/arch/ARM/ARMDisassembler.h index 713b00d3a..17c4a89b9 100644 --- a/arch/ARM/ARMDisassembler.h +++ b/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); diff --git a/arch/ARM/ARMMapping.h b/arch/ARM/ARMMapping.h index f537e555d..f26d5376b 100644 --- a/arch/ARM/ARMMapping.h +++ b/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 diff --git a/arch/Mips/MipsDisassembler.h b/arch/Mips/MipsDisassembler.h index 933a99eb9..ae187d85a 100644 --- a/arch/Mips/MipsDisassembler.h +++ b/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); diff --git a/arch/Mips/MipsMapping.h b/arch/Mips/MipsMapping.h index f6d4b4fda..beeb80bc5 100644 --- a/arch/Mips/MipsMapping.h +++ b/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); diff --git a/arch/PowerPC/PPCDisassembler.h b/arch/PowerPC/PPCDisassembler.h index c26d970be..842efe205 100644 --- a/arch/PowerPC/PPCDisassembler.h +++ b/arch/PowerPC/PPCDisassembler.h @@ -6,7 +6,7 @@ #include -#include "../../include/capstone.h" +#include "capstone/capstone.h" #include "../../MCRegisterInfo.h" #include "../../MCInst.h" diff --git a/arch/PowerPC/PPCMapping.h b/arch/PowerPC/PPCMapping.h index 9694f9691..299521bc2 100644 --- a/arch/PowerPC/PPCMapping.h +++ b/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); diff --git a/arch/PowerPC/PPCPredicates.h b/arch/PowerPC/PPCPredicates.h index 9e4728379..a620e14bb 100644 --- a/arch/PowerPC/PPCPredicates.h +++ b/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 { diff --git a/arch/Sparc/Sparc.h b/arch/Sparc/Sparc.h index 42f942513..18c0d3131 100644 --- a/arch/Sparc/Sparc.h +++ b/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) { diff --git a/arch/Sparc/SparcDisassembler.h b/arch/Sparc/SparcDisassembler.h index bafa2307e..5b635b866 100644 --- a/arch/Sparc/SparcDisassembler.h +++ b/arch/Sparc/SparcDisassembler.h @@ -6,7 +6,7 @@ #include -#include "../../include/capstone.h" +#include "capstone/capstone.h" #include "../../MCRegisterInfo.h" #include "../../MCInst.h" diff --git a/arch/Sparc/SparcMapping.h b/arch/Sparc/SparcMapping.h index fa9bcae68..98d629a58 100644 --- a/arch/Sparc/SparcMapping.h +++ b/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); diff --git a/arch/SystemZ/SystemZDisassembler.h b/arch/SystemZ/SystemZDisassembler.h index e77a73854..4111e0ae8 100644 --- a/arch/SystemZ/SystemZDisassembler.h +++ b/arch/SystemZ/SystemZDisassembler.h @@ -6,7 +6,7 @@ #include -#include "../../include/capstone.h" +#include "capstone/capstone.h" #include "../../MCRegisterInfo.h" #include "../../MCInst.h" diff --git a/arch/SystemZ/SystemZMapping.h b/arch/SystemZ/SystemZMapping.h index 0abb772f0..fdbf17db4 100644 --- a/arch/SystemZ/SystemZMapping.h +++ b/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); diff --git a/arch/X86/X86Disassembler.h b/arch/X86/X86Disassembler.h index 2c21ede09..f1a15ce0d 100644 --- a/arch/X86/X86Disassembler.h +++ b/arch/X86/X86Disassembler.h @@ -79,7 +79,7 @@ #include -#include "../../include/capstone.h" +#include "capstone/capstone.h" #include "../../MCInst.h" diff --git a/arch/X86/X86Mapping.h b/arch/X86/X86Mapping.h index d6f251752..0d80d7842 100644 --- a/arch/X86/X86Mapping.h +++ b/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 diff --git a/arch/XCore/XCoreDisassembler.h b/arch/XCore/XCoreDisassembler.h index 07cb9ffe8..645eceee6 100644 --- a/arch/XCore/XCoreDisassembler.h +++ b/arch/XCore/XCoreDisassembler.h @@ -6,7 +6,7 @@ #include -#include "../../include/capstone.h" +#include "capstone/capstone.h" #include "../../MCRegisterInfo.h" #include "../../MCInst.h" diff --git a/arch/XCore/XCoreMapping.h b/arch/XCore/XCoreMapping.h index 7ad50d963..95e98dbac 100644 --- a/arch/XCore/XCoreMapping.h +++ b/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); diff --git a/bindings/ocaml/ocaml.c b/bindings/ocaml/ocaml.c index aba0f1a42..820eb4d4a 100644 --- a/bindings/ocaml/ocaml.c +++ b/bindings/ocaml/ocaml.c @@ -8,7 +8,7 @@ #include #include -#include "../../include/capstone.h" +#include "capstone/capstone.h" #define ARR_SIZE(a) (sizeof(a)/sizeof(a[0])) diff --git a/cs.c b/cs.c index c4f8c8f64..2ad6b71f1 100644 --- a/cs.c +++ b/cs.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include "utils.h" #include "MCRegisterInfo.h" diff --git a/cs_priv.h b/cs_priv.h index b56030c14..a34302269 100644 --- a/cs_priv.h +++ b/cs_priv.h @@ -4,7 +4,7 @@ #ifndef CS_PRIV_H #define CS_PRIV_H -#include +#include #include "MCInst.h" #include "SStream.h" diff --git a/include/arm.h b/include/capstone/arm.h similarity index 100% rename from include/arm.h rename to include/capstone/arm.h diff --git a/include/arm64.h b/include/capstone/arm64.h similarity index 100% rename from include/arm64.h rename to include/capstone/arm64.h diff --git a/include/capstone.h b/include/capstone/capstone.h similarity index 100% rename from include/capstone.h rename to include/capstone/capstone.h diff --git a/include/mips.h b/include/capstone/mips.h similarity index 100% rename from include/mips.h rename to include/capstone/mips.h diff --git a/include/platform.h b/include/capstone/platform.h similarity index 100% rename from include/platform.h rename to include/capstone/platform.h diff --git a/include/ppc.h b/include/capstone/ppc.h similarity index 100% rename from include/ppc.h rename to include/capstone/ppc.h diff --git a/include/sparc.h b/include/capstone/sparc.h similarity index 100% rename from include/sparc.h rename to include/capstone/sparc.h diff --git a/include/systemz.h b/include/capstone/systemz.h similarity index 100% rename from include/systemz.h rename to include/capstone/systemz.h diff --git a/include/x86.h b/include/capstone/x86.h similarity index 100% rename from include/x86.h rename to include/capstone/x86.h diff --git a/include/xcore.h b/include/capstone/xcore.h similarity index 100% rename from include/xcore.h rename to include/capstone/xcore.h diff --git a/tests/test.c b/tests/test.c index 9d77a545f..b6fd8c98d 100644 --- a/tests/test.c +++ b/tests/test.c @@ -5,7 +5,7 @@ #include #include "../inttypes.h" -#include +#include struct platform { cs_arch arch; diff --git a/tests/test_arm.c b/tests/test_arm.c index e468b5bbe..60ddfefab 100644 --- a/tests/test_arm.c +++ b/tests/test_arm.c @@ -5,7 +5,7 @@ #include #include "../inttypes.h" -#include +#include static csh handle; diff --git a/tests/test_arm64.c b/tests/test_arm64.c index ca7419bea..4c88b3c90 100644 --- a/tests/test_arm64.c +++ b/tests/test_arm64.c @@ -5,7 +5,7 @@ #include #include "../inttypes.h" -#include +#include static csh handle; diff --git a/tests/test_detail.c b/tests/test_detail.c index 94e40070b..54ffd0e6d 100644 --- a/tests/test_detail.c +++ b/tests/test_detail.c @@ -5,7 +5,7 @@ #include #include "../inttypes.h" -#include +#include struct platform { cs_arch arch; diff --git a/tests/test_iter.c b/tests/test_iter.c index ec26738f9..5bbae6e67 100644 --- a/tests/test_iter.c +++ b/tests/test_iter.c @@ -6,7 +6,7 @@ #include #include "../inttypes.h" -#include +#include struct platform { cs_arch arch; diff --git a/tests/test_mips.c b/tests/test_mips.c index 4da243e9b..04d7cbde9 100644 --- a/tests/test_mips.c +++ b/tests/test_mips.c @@ -5,7 +5,7 @@ #include #include "../inttypes.h" -#include +#include struct platform { cs_arch arch; diff --git a/tests/test_ppc.c b/tests/test_ppc.c index c6b5244b9..bb800ef18 100644 --- a/tests/test_ppc.c +++ b/tests/test_ppc.c @@ -4,7 +4,7 @@ #include #include "../inttypes.h" -#include +#include struct platform { cs_arch arch; diff --git a/tests/test_skipdata.c b/tests/test_skipdata.c index 07a305b4b..0f17e6f1e 100644 --- a/tests/test_skipdata.c +++ b/tests/test_skipdata.c @@ -5,7 +5,7 @@ #include #include "../inttypes.h" -#include +#include struct platform { cs_arch arch; diff --git a/tests/test_sparc.c b/tests/test_sparc.c index d7399a9e4..998f0bb7e 100644 --- a/tests/test_sparc.c +++ b/tests/test_sparc.c @@ -4,7 +4,7 @@ #include #include "../inttypes.h" -#include +#include struct platform { cs_arch arch; diff --git a/tests/test_systemz.c b/tests/test_systemz.c index 36a0a96a5..253951d4b 100644 --- a/tests/test_systemz.c +++ b/tests/test_systemz.c @@ -4,7 +4,7 @@ #include #include "../inttypes.h" -#include +#include struct platform { cs_arch arch; diff --git a/tests/test_x86.c b/tests/test_x86.c index 4d31074c8..24f80a79b 100644 --- a/tests/test_x86.c +++ b/tests/test_x86.c @@ -5,7 +5,7 @@ #include #include "../inttypes.h" -#include +#include static csh handle; diff --git a/tests/test_xcore.c b/tests/test_xcore.c index 652ef5ab1..926f8a0f2 100644 --- a/tests/test_xcore.c +++ b/tests/test_xcore.c @@ -4,7 +4,7 @@ #include #include "../inttypes.h" -#include +#include struct platform { cs_arch arch; diff --git a/utils.h b/utils.h index 60ed8221d..d3d5c01b2 100644 --- a/utils.h +++ b/utils.h @@ -5,7 +5,7 @@ #define CS_UTILS_H #include -#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