* Some changes and fixes for the build of swig

- Thanks sre
  - 'make swig-install' is the way to go :)
This commit is contained in:
pancake 2010-03-14 00:36:55 +01:00
parent 1ca2b661df
commit b3a224fbbb
3 changed files with 8 additions and 8 deletions

View File

@ -1,7 +1,7 @@
include config-user.mk
include global.mk
all: plugins.cfg libr swig r2rc
all: plugins.cfg libr r2rc
plugins.cfg:
./configure-plugins
@ -13,9 +13,10 @@ r2rc:
cd r2rc && ${MAKE} all
swig:
ifeq (${HAVE_VALASWIG},1)
cd swig && ${MAKE} all
endif
cd swig && ${MAKE} all PREFIX=${PREFIX} DESTDIR=${DESTDIR}
swig-install: install swig
cd swig && ${MAKE} install PREFIX=${PREFIX} DESTDIR=${DESTDIR}
vdoc:
rm -rf vdoc
@ -53,7 +54,6 @@ install: install-man
${INSTALL_DIR} ${DESTDIR}${PREFIX}/share/doc/radare2
for a in doc/* ; do ${INSTALL_DATA} $$a ${DESTDIR}/${PREFIX}/share/doc/radare2 ; done
cd libr && ${MAKE} install PARENT=1 PREFIX=${PREFIX} DESTDIR=${DESTDIR}
cd swig && ${MAKE} install PREFIX=${PREFIX} DESTDIR=${DESTDIR}
cd r2rc && ${MAKE} install PREFIX=${PREFIX} DESTDIR=${DESTDIR}
uninstall:
@ -82,4 +82,4 @@ shot:
include ${MKPLUGINS}
.PHONY: all clean mrproper install uninstall deinstall dist shot pkgcfg vdoc swig libr r2rc install-man
.PHONY: all clean mrproper install uninstall deinstall dist shot pkgcfg vdoc swig libr r2rc install-man swig swig-install

View File

@ -6,7 +6,7 @@ PFX=${DESTDIR}${PREFIX}
#PREFIX=${PFX}
# Libraries
LIBLIST=util lib io meta lang flags bin macro hash line cons print config syscall socket cmd asm anal parse search diff bp reg debug core sign vm th db
LIBLIST=util line cons line lib io meta lang flags bin macro hash print config syscall socket cmd asm anal parse search diff bp reg debug core sign vm th db
# Under development
#LIBLIST+=print

View File

@ -6,5 +6,5 @@ ALL_TARGETS+=${TARGET_PTRACE}
${TARGET_PTRACE}: ${OBJ_PTRACE}
${CC} ${CFLAGS} -o ${TARGET_PTRACE} ${LDFLAGS_LIB} \
${LDFLAGS_LINKPATH}../util -lr_util \
${LDFLAGS_LINKPATH}../../util -lr_util \
${LDFLAGS_LINKPATH}.. -lr_io ${OBJ_PTRACE}