Move arch headers from ./lib/include

libr/anal/p/8051.mk

@@ -1,4 +1,5 @@
 OBJ_8051=anal_8051.o
+CFLAGS+=-I../asm/arch/8051
 
 STATIC_OBJ+=${OBJ_8051}
 #OBJ_8051+=../../../../../../../../../../../../../../../../../../../../${LTOP}/asm/arch/8051/8051.o

libr/anal/p/cr16.mk

@@ -1,4 +1,5 @@
 OBJ_CR16=anal_cr16.o
+CFLAGS+=-I../asm/arch/cr16/
 
 STATIC_OBJ+=${OBJ_CR16}
 #OBJ_CR16+=../../../../../../../../../../../../../../../../../../../../${LTOP}/asm/arch/cr16/cr16_disas.o
@@ -10,4 +11,4 @@ ALL_TARGETS+=${TARGET_CR16}
 ${TARGET_CR16}: ${OBJ_CR16} ${SHARED_OBJ}
 	$(call pwd)
 	${CC} $(call libname,anal_cr16) ${CFLAGS} \
-		-I../../include/ -o ${TARGET_CR16} ${OBJ_CR16}
+		-o ${TARGET_CR16} ${OBJ_CR16}

libr/anal/p/ebc.mk

@@ -1,4 +1,5 @@
 OBJ_EBC=anal_ebc.o
+CFLAGS+=-I../asm/arch/ebc/
 
 STATIC_OBJ+=${OBJ_EBC}
 #OBJ_EBC+=../../../../../../../../../../../../../../../../../../../../${LTOP}/asm/arch/ebc/ebc_disas.o
@@ -10,4 +11,4 @@ ALL_TARGETS+=${TARGET_EBC}
 ${TARGET_EBC}: ${OBJ_EBC} ${SHARED_OBJ}
 	$(call pwd)
 	${CC} $(call libname,anal_ebc) ${CFLAGS} \
-		-I../../include/ -o ${TARGET_EBC} ${OBJ_EBC}
+		-o ${TARGET_EBC} ${OBJ_EBC}

libr/anal/p/h8300.mk

@@ -1,4 +1,5 @@
 OBJ_H8300=anal_h8300.o
+CFLAGS+=-I../asm/arch/h8300/
 
 STATIC_OBJ+=${OBJ_H8300}
 #OBJ_H8300+=../../../../../../../../../../../../../../../../../../../../${LTOP}/asm/arch/h8300/h8300_disas.o
@@ -10,4 +11,4 @@ ALL_TARGETS+=${TARGET_H8300}
 ${TARGET_H8300}: ${OBJ_H8300} ${SHARED_OBJ}
 	$(call pwd)
 	${CC} $(call libname,anal_h8300) ${CFLAGS} \
-		-I../../include/ -o ${TARGET_H8300} ${OBJ_H8300}
+		-o ${TARGET_H8300} ${OBJ_H8300}

libr/anal/p/msp430.mk

@@ -1,4 +1,5 @@
 OBJ_msp430=anal_msp430.o
+CFLAGS+=-I../asm/arch/msp430/
 
 STATIC_OBJ+=${OBJ_msp430}
 OBJ_msp430+=../../asm/arch/msp430/msp430_disas.o
@@ -9,4 +10,4 @@ ALL_TARGETS+=${TARGET_msp430}
 ${TARGET_msp430}: ${OBJ_msp430} ${SHARED_OBJ}
 	$(call pwd)
 	${CC} $(call libname,anal_msp430) ${CFLAGS} \
-		-I../../include/ -o ${TARGET_msp430} ${OBJ_msp430}
+		-o ${TARGET_msp430} ${OBJ_msp430}

libr/anal/p/propeller.mk

@@ -1,4 +1,5 @@
 OBJ_propeller=anal_propeller.o
+CFLAGS+=-I../asm/arch/propeller/
 
 STATIC_OBJ+=${OBJ_propeller}
 OBJ_propeller+=../../asm/arch/propeller/propeller_disas.o
@@ -9,4 +10,4 @@ ALL_TARGETS+=${TARGET_propeller}
 ${TARGET_propeller}: ${OBJ_propeller} ${SHARED_OBJ}
 	$(call pwd)
 	${CC} $(call libname,anal_propeller) ${CFLAGS} \
-		-I../../include/ -o ${TARGET_propeller} ${OBJ_propeller}
+		-o ${TARGET_propeller} ${OBJ_propeller}

libr/anal/p/v850.mk

@@ -5,9 +5,11 @@ STATIC_OBJ+=${OBJ_V850}
 OBJ_V850+=../../asm/arch/v850/v850_disas.o
 TARGET_V850=anal_v850.${EXT_SO}
 
+CFLAGS+=-I../asm/arch/v850/
+
 ALL_TARGETS+=${TARGET_V850}
 
 ${TARGET_V850}: ${OBJ_V850} ${SHARED_OBJ}
 	$(call pwd)
 	${CC} $(call libname,anal_v850) ${CFLAGS} \
-		-I../../include/ -o ${TARGET_V850} ${OBJ_V850}
+		-I../../asm/arch/v850/ -o ${TARGET_V850} ${OBJ_V850}

libr/asm/p/8051.mk

@@ -1,5 +1,6 @@
 OBJ_8051=asm_8051.o
 OBJ_8051+=../arch/8051/8051.o
+CFLAGS+=-I./arch/8051/
 
 STATIC_OBJ+=${OBJ_8051}
 TARGET_8051=asm_8051.${EXT_SO}

libr/asm/p/cr16.mk

@@ -1,5 +1,6 @@
 OBJ_CR16=asm_cr16.o
 OBJ_CR16+=../arch/cr16/cr16_disas.o
+CFLAGS+=-I./arch/cr16
 
 
 STATIC_OBJ+=${OBJ_CR16}
@@ -8,4 +9,4 @@ TARGET_CR16=asm_cr16.${EXT_SO}
 ALL_TARGETS+=${TARGET_CR16}
 
 ${TARGET_CR16}: ${OBJ_CR16}
-	${CC} ${LDFLAGS} ${CFLAGS} -I../arch/cr16 -o ${TARGET_CR16} ${OBJ_CR16}
+	${CC} ${LDFLAGS} ${CFLAGS} -o ${TARGET_CR16} ${OBJ_CR16}

libr/asm/p/ebc.mk

@@ -1,5 +1,6 @@
 OBJ_EBC=asm_ebc.o
 OBJ_EBC+=../arch/ebc/ebc_disas.o
+CFLAGS+=-I./arch/ebc/
 
 STATIC_OBJ+=${OBJ_EBC}
 TARGET_EBC=asm_ebc.${EXT_SO}
@@ -7,4 +8,4 @@ TARGET_EBC=asm_ebc.${EXT_SO}
 ALL_TARGETS+=${TARGET_EBC}
 
 ${TARGET_EBC}: ${OBJ_EBC}
-	${CC} ${LDFLAGS} ${CFLAGS} -I../arc/ebc/ -o ${TARGET_EBC} ${OBJ_EBC}
+	${CC} ${LDFLAGS} ${CFLAGS} -o ${TARGET_EBC} ${OBJ_EBC}

libr/asm/p/h8300.mk

@@ -1,5 +1,6 @@
 OBJ_H8300=asm_h8300.o
 OBJ_H8300+=../arch/h8300/h8300_disas.o
+CFLAGS+=-I./arch/h8300
 
 
 STATIC_OBJ+=${OBJ_H8300}
@@ -8,4 +9,4 @@ TARGET_H8300=asm_h8300.${EXT_SO}
 ALL_TARGETS+=${TARGET_H8300}
 
 ${TARGET_H8300}: ${OBJ_H8300}
-	${CC} ${LDFLAGS} ${CFLAGS} -I../arch/h8300 -o ${TARGET_H8300} ${OBJ_H8300}
+	${CC} ${LDFLAGS} ${CFLAGS} -o ${TARGET_H8300} ${OBJ_H8300}

libr/asm/p/msp430.mk

@@ -1,5 +1,6 @@
 OBJ_MSP430=asm_msp430.o
 OBJ_MSP430+=../arch/msp430/msp430_disas.o
+CFLAGS+=-I./arch/msp430/
 
 STATIC_OBJ+=${OBJ_MSP430}
 TARGET_MSP430=asm_msp430.${EXT_SO}
@@ -7,4 +8,4 @@ TARGET_MSP430=asm_msp430.${EXT_SO}
 ALL_TARGETS+=${TARGET_MSP430}
 
 ${TARGET_MSP430}: ${OBJ_MSP430}
-	${CC} ${LDFLAGS} ${CFLAGS} -I../arch/msp430 -o ${TARGET_MSP430} ${OBJ_MSP430}
+	${CC} ${LDFLAGS} ${CFLAGS} -o ${TARGET_MSP430} ${OBJ_MSP430}

libr/asm/p/propeller.mk

@@ -1,5 +1,6 @@
 OBJ_PROPELLER=asm_propeller.o
 OBJ_PROPELLER+=../arch/propeller/propeller_disas.o
+CFLAGS+=-I../arch/propeller/
 
 STATIC_OBJ+=${OBJ_PROPELLER}
 TARGET_PROPELLER=asm_propeller.${EXT_SO}
@@ -7,4 +8,4 @@ TARGET_PROPELLER=asm_propeller.${EXT_SO}
 ALL_TARGETS+=${TARGET_PROPELLER}
 
 ${TARGET_PROPELLER}: ${OBJ_PROPELLER}
-	${CC} ${LDFLAGS} ${CFLAGS} -I../arch/propeller -o ${TARGET_PROPELLER} ${OBJ_PROPELLER}
+	${CC} ${LDFLAGS} ${CFLAGS} -o ${TARGET_PROPELLER} ${OBJ_PROPELLER}

libr/asm/p/v850.mk

@@ -1,5 +1,6 @@
 OBJ_V850=asm_v850.o
 OBJ_V850+=../arch/v850/v850_disas.o
+CFLAGS+=-I./arch/v850
 
 
 STATIC_OBJ+=${OBJ_V850}
@@ -8,4 +9,4 @@ TARGET_V850=asm_v850.${EXT_SO}
 ALL_TARGETS+=${TARGET_V850}
 
 ${TARGET_V850}: ${OBJ_V850}
-	${CC} ${LDFLAGS} ${CFLAGS} -I../arch/v850 -o ${TARGET_V850} ${OBJ_V850}
+	${CC} ${LDFLAGS} ${CFLAGS} -o ${TARGET_V850} ${OBJ_V850}