* Many bug fixes for the build. Oops

This commit is contained in:
pancake 2010-01-15 01:56:43 +01:00
parent 8ba7b6b043
commit 3d667dbdd9
11 changed files with 34 additions and 27 deletions

View File

@ -1,3 +1,4 @@
BINDEPS=foo
include ../../config.mk
CFLAGS=-I../../include -I../../asm/arch/ -I../arch/ -Wall -fPIC -shared -Wl,-R.. -L..

View File

@ -1,10 +1,11 @@
BINDEPS=bla
include ../../config.mk
include ../../../mk/${COMPILER}.mk
#include ../../../mk/${COMPILER}.mk
all: test${EXT_EXE}
test${EXT_EXE}:
${CC} -g -I ../../include test.c ../*.o -lr_util -L../../util -o tes${EXT_EXE}
${CC} -g -I ../../include test.c ../*.o -lr_util -L../../util -o test${EXT_EXE}
clean:
rm -f test

View File

@ -239,7 +239,9 @@ R_API int r_io_wundo_set(struct r_io_t *io, int n, int set);
R_API int r_io_hook(struct r_io_t *io, CB_IO);
#endif
/* plugins */
extern struct r_io_handle_t r_io_plugin_dbg;
extern struct r_io_handle_t r_io_plugin_malloc;
extern struct r_io_handle_t r_io_plugin_ptrace;
extern struct r_io_handle_t r_io_plugin_debug;
extern struct r_io_handle_t r_io_plugin_shm;
#endif

View File

@ -3,10 +3,12 @@ DEPS=r_lib r_util
#DEPS=r_util
CFLAGS+=-Wall -DCORELIB
foo: pre libr_io.so tests plugins
STATIC_OBJS=
include ../config.mk
foo: pre libr_io.${EXT_SO} libr_io.${EXT_AR} tests plugins
include ${STATIC_IO_PLUGINS}
STATIC_OBJS=$(subst ..,p/..,$(subst io_,p/io_,$(STATIC_OBJ)))
OBJ=${STATIC_OBJS} io.o handle.o map.o section.o desc.o cache.o undo.o

View File

@ -125,7 +125,7 @@ static int __init(struct r_io_t *io)
return R_TRUE;
}
struct r_io_handle_t r_io_plugin_dbg = {
struct r_io_handle_t r_io_plugin_debug = {
//void *handle;
.name = "io_dbg",
.desc = "Debug a program or pid. dbg:///bin/ls, dbg://1388",
@ -146,7 +146,7 @@ struct r_io_handle_t r_io_plugin_dbg = {
#ifndef CORELIB
struct r_lib_struct_t radare_plugin = {
.type = R_LIB_TYPE_IO,
.data = &r_io_plugin_dbg
.data = &r_io_plugin_debug
};
#endif

View File

@ -1,7 +1,7 @@
OBJ_SHM=io_shm.o
STATIC_OBJ+=${OBJ_SHM}
TARGET_SHM=io_shm.so
TARGET_SHM=io_shm.${EXT_SO}
ALL_TARGETS+=${TARGET_SHM}
${TARGET_SHM}: ${OBJ_SHM}

View File

@ -1,17 +1,17 @@
CFLAGS=-I ../../include -g
LDPATH=-L.. -L../../util -L../../lib
LDPATH=-L.. -Wl,-R.. -L../../util -L../../lib
LDPATH+=-lr_io -lr_util -lr_lib
all: map cat read4
all: map cat${EXT_EXE} read4${EXT_EXE}
cat: cat.o
${CC} cat.o ${LDPATH} -Wl,-R.. -lr_io -g -o cat
cat${EXT_EXE}: cat.o
${CC} cat.o ${LDPATH} -Wl,-R.. -g -o cat${EXT_EXE}
map: map.o
${CC} map.o ${LDPATH} -lr_io -g -o map
map${EXT_EXE}: map.o
${CC} map.o ${LDPATH} -g -o map${EXT_EXE}
read4: read4.o
${CC} read4.o ${LDPATH} -lr_io -g -o read4
read4${EXT_EXE}: read4.o
${CC} read4.o ${LDPATH} -g -o read4${EXT_EXE}
clean:
rm -f cat read4 map *.o

View File

@ -1,4 +1,5 @@
include ../../../config-user.mk
BINDEPS=foo
#include ../../../config-user.mk
include ../../config.mk
CFLAGS=-I../../include -Wall -DPREFIX=\"${PREFIX}\"

View File

@ -1,11 +1,11 @@
NAME=r_parse
DEPS=r_lib
foo: pre libr_parse.so plugins bins
-include ../config.mk
foo: pre libr_parse.${EXT_SO} libr_parse.${EXT_AR} plugins bins
CFLAGS+=-DCORELIB
include ../config.mk
include ${STATIC_PARSE_PLUGINS}
-include ${STATIC_PARSE_PLUGINS}
STATIC_OBJS=$(subst ..,p/..,$(subst parse_,p/parse_,$(STATIC_OBJ)))
OBJ=parse.o ${STATIC_OBJS}

View File

@ -1,4 +1,5 @@
# TODO: append EXECEXT to BINS
BINDEPS=foo
include ../../config.mk
FLAGS=-I../../include -Wl,-R.. -L.. -lr_util -g -DVERSION=\"${VERSION}\"
BINS=test${EXT_EXE}
@ -10,13 +11,12 @@ BINS+=pool${EXT_EXE}
BINS+=test_sys${EXT_EXE}
BINS+=test_str${EXT_EXE}
all: test${EXT_EXE}
#all: ${BINS}
all: ${BINS}
ralloc${EXT_EXE}:
${CC} ${FLAGS} ralloc.c -o ralloc${EXT_EXE}
test${EXT_EXE}: test.c
test${EXT_EXE}:
${CC} ${FLAGS} test.c -o test${EXT_EXE}
test_sys${EXT_EXE}: test_sys.c
@ -37,9 +37,9 @@ iter${EXT_EXE}:
file_slurp_hexpairs${EXT_EXE}:
${CC} ${FLAGS} test_file_slurp_hexpairs.c -o file_slurp_hexpairs${EXT_EXE}
clean:
myclean:
rm -f ${BINS}
.PHONY: ${BINS} clean all
.PHONY: myclean clean all
include ../../rules.mk

View File

@ -16,7 +16,6 @@ debug.ptrace
io.debug
io.malloc
io.ptrace
io.shm
parse.dummy
parse.mreplace
parse.x86_pseudo"
@ -28,4 +27,5 @@ asm.m68k
asm.ppc
asm.psosvm
asm.sparc
debug.gdb"
debug.gdb
io.shm"