* Move vapi directory into swig/

- Two splitted distribution files:
    - radare2 and radare2-swig
    - Making it more debian friendly for packaging

--HG--
rename : libr/vapi/libr.deps => swig/vapi/libr.deps
rename : libr/vapi/libr.vapi => swig/vapi/libr.vapi
rename : libr/vapi/r_anal.vapi => swig/vapi/r_anal.vapi
rename : libr/vapi/r_asm.vapi => swig/vapi/r_asm.vapi
rename : libr/vapi/r_bin.deps => swig/vapi/r_bin.deps
rename : libr/vapi/r_bin.vapi => swig/vapi/r_bin.vapi
rename : libr/vapi/r_bp.vapi => swig/vapi/r_bp.vapi
rename : libr/vapi/r_config.vapi => swig/vapi/r_config.vapi
rename : libr/vapi/r_cons.vapi => swig/vapi/r_cons.vapi
rename : libr/vapi/r_core.vapi => swig/vapi/r_core.vapi
rename : libr/vapi/r_crypto.vapi => swig/vapi/r_crypto.vapi
rename : libr/vapi/r_db.vapi => swig/vapi/r_db.vapi
rename : libr/vapi/r_debug.deps => swig/vapi/r_debug.deps
rename : libr/vapi/r_debug.vapi => swig/vapi/r_debug.vapi
rename : libr/vapi/r_diff.vapi => swig/vapi/r_diff.vapi
rename : libr/vapi/r_hash.vapi => swig/vapi/r_hash.vapi
rename : libr/vapi/r_io.deps => swig/vapi/r_io.deps
rename : libr/vapi/r_io.vapi => swig/vapi/r_io.vapi
rename : libr/vapi/r_lang.vapi => swig/vapi/r_lang.vapi
rename : libr/vapi/r_lib.vapi => swig/vapi/r_lib.vapi
rename : libr/vapi/r_line.vapi => swig/vapi/r_line.vapi
rename : libr/vapi/r_parse.vapi => swig/vapi/r_parse.vapi
rename : libr/vapi/r_reg.vapi => swig/vapi/r_reg.vapi
rename : libr/vapi/r_search.vapi => swig/vapi/r_search.vapi
rename : libr/vapi/r_socket.vapi => swig/vapi/r_socket.vapi
rename : libr/vapi/r_syscall.vapi => swig/vapi/r_syscall.vapi
rename : libr/vapi/r_util.vapi => swig/vapi/r_util.vapi
rename : libr/vapi/t/Makefile => swig/vapi/t/Makefile
rename : libr/vapi/t/array.vala => swig/vapi/t/array.vala
rename : libr/vapi/t/asm.gs => swig/vapi/t/asm.gs
rename : libr/vapi/t/asm.vala => swig/vapi/t/asm.vala
rename : libr/vapi/t/bin.vala => swig/vapi/t/bin.vala
rename : libr/vapi/t/bintest.vala => swig/vapi/t/bintest.vala
rename : libr/vapi/t/core.vala => swig/vapi/t/core.vala
rename : libr/vapi/t/db.vala => swig/vapi/t/db.vala
rename : libr/vapi/t/hash.vala => swig/vapi/t/hash.vala
rename : libr/vapi/t/io.vala => swig/vapi/t/io.vala
rename : libr/vapi/t/lang.vala => swig/vapi/t/lang.vala
rename : libr/vapi/t/list.vala => swig/vapi/t/list.vala
rename : libr/vapi/t/list.vapi => swig/vapi/t/list.vapi
rename : libr/vapi/t/regs.vala => swig/vapi/t/regs.vala
rename : libr/vapi/t/sc.vala => swig/vapi/t/sc.vala
rename : libr/vapi/t/search.gs => swig/vapi/t/search.gs
rename : libr/vapi/t/search.vala => swig/vapi/t/search.vala
rename : libr/vapi/t/socket.vala => swig/vapi/t/socket.vala

Makefile

@@ -18,17 +18,6 @@ swig:
 swig-install: install swig
 	cd swig && ${MAKE} install PREFIX=${PREFIX} DESTDIR=${DESTDIR}
 
-vdoc:
-	rm -rf vdoc
-	cat libr/vapi/*.vapi > /tmp/libr.vapi
-	valadoc -o vdoc /tmp/libr.vapi
-	# rsync -avz vdoc/* pancake@radare.org:/srv/http/radareorg/vdoc/
-
-vdoc_pkg:
-	rm -rf vdoc
-	valadoc -o vdoc libr/vapi/*.vapi
-	# rsync -avz vdoc/* pancake@radare.org:/srv/http/radareorg/vdoc/
-
 w32dist:
 	mkdir w32dist
 	for a in `find * | grep -e exe$$ -e dll$$`; do cp $$a w32dist ; done
@@ -63,6 +52,9 @@ deinstall: uninstall
 	cd libr && ${MAKE} uninstall PARENT=1 PREFIX=${PREFIX} DESTDIR=${DESTDIR}
 	rm -rf ${DESTDIR}${PREFIX}/share/doc/radare2
 
+swig-dist:
+	cd swig && ${MAKE} dist
+
 dist:
 	VERSION=${VERSION} ; \
 	FILES=`hg st -mc .| cut -c 3-|sed -e s,^,radare2-${VERSION}/,` ; \

libr/Makefile

@@ -54,10 +54,6 @@ pkgcfg:
 	cd asm && ${MAKE} pkgcfg NAME=libr DEPS="r_`echo ${LIBLIST}|sed -e 's, , r_,g'`"
 	# TODO: Magically generate libr.pc.acr here using LIBLIST and so :)
 
-install-vapi:
-	@${INSTALL_DIR} ${PFX}/share/vala/vapi
-	${INSTALL_DATA} vapi/*.vapi vapi/*.deps ${PFX}/share/vala/vapi
-
 install-pkgconfig:
 	@${INSTALL_DIR} ${PFX}/lib/pkgconfig
 	for a in ../pkgcfg/*.pc ; do ${INSTALL_DATA} $$a ${PFX}/lib/pkgconfig ; done
@@ -81,7 +77,7 @@ install-test-bins:
 	  do echo "$$a ${PFX}/lib/radare2/test" ; \
 	  ${INSTALL_PROGRAM} $$a ${PFX}/lib/radare2/test ; done
 
-install: install-includes install-vapi install-pkgconfig install-bins install-test-bins
+install: install-includes install-pkgconfig install-bins install-test-bins
 	# TODO :Use INSTALL_DATA_DIR instead of mkdir
 	# libraries
 	@${INSTALL_DIR} ${PFX}/lib
@@ -110,7 +106,6 @@ deinstall uninstall:
 	echo ${PREFIX}/lib/$$a ; rm -f ${PREFIX}/lib/$$a ; done
 	### includes
 	-(cd include && for a in * ; do rm -f ${PREFIX}/libr/$$a ; done)
-	cd vapi/ ; for a in *.vapi *.deps ; do rm -f ${PREFIX}/share/vala/vapi/$$a ; done
 	### programs
 	-@for a in `find */t -perm -u+x -type f | grep 2`; do \
 	a=`echo $$a|awk -F / '{ print $$NF; }'`; \
@@ -134,7 +129,6 @@ todo:
 
 clean:
 	for lib in ${LIBLIST}; do ( cd $${lib} && ${MAKE} clean ); done
-	cd vapi/t && ${MAKE} clean
 	rm -rf .objs
 
 mrproper: clean

libr/rules.mk

@@ -3,9 +3,6 @@
 -include ../config.mk
 -include ../../config.mk
 
-#-include ../global.mk
-#-include ../../global.mk
-
 #-------------------------------------#
 # Rules for libraries
 ifeq (${BINDEPS},)
@@ -20,14 +17,17 @@ real_all all: ${LIBSO} ${LIBAR} ${EXTRA_TARGETS}
 
 SRC=$(subst .o,.c,$(OBJ))
 
+# TODO: 0 -> version
+LIBNAME=-Wl,-soname,${LIBSO}.0
+
 ifeq ($(WITHPIC),1)
 ${LIBSO}: ${OBJ}
 	@for a in ${OBJ} ${SRC}; do \
 	  do=0 ; [ ! -e ${LIBSO} ] && do=1 ; \
 	  test $$a -nt ${LIBSO} && do=1 ; \
 	  if [ $$do = 1 ]; then \
-	    echo "${CC_LIB} ${OBJ} ${LDFLAGS} ${LINK}" ; \
-	    ${CC_LIB} ${OBJ} ${LDFLAGS} ${LINK} ; \
+	    echo "${CC_LIB} ${LIBNAME} ${OBJ} ${LDFLAGS} ${LINK}" ; \
+	    ${CC_LIB} ${LIBNAME} ${OBJ} ${LDFLAGS} ${LINK} ; \
 	    if [ -f "../stripsyms.sh" ]; then sh ../stripsyms.sh ${LIBSO} ${NAME} ; fi ; \
 	  break ; \
 	fi ; done
@@ -111,11 +111,4 @@ endif
 
 #-------------------------------
 
-#if RUNTIME_DEBUG
-CFLAGS+=-DR_RTDEBUG
-#endif
-
-// TODO: Not working
-#if STATIC_DEBUG
-#CFLAGS+=-DR_DEBUG
-#endif
+# TODO: deprecate RTDEBUG and R_DEBUG

swig/Makefile

@@ -1,11 +1,32 @@
-include ../config-user.mk
-include ../global.mk
+-include ../config-user.mk
+-include ../global.mk
 
 all: supported.langs ruby perl python lua
 
 supported.langs:
 	sh check-langs.sh
 
+dist:
+	PKG=radare2-swig-${VERSION} ; \
+	FILES=`cd .. && hg st -mac . | grep swig | sed -e "s,swig/,$${PKG}/," | cut -c 3-` ; \
+	cd .. && mv swig $${PKG} && \
+	echo $$FILES ; \
+	tar czvf $${PKG}.tar.gz $${FILES} ; \
+	mv $${PKG} swig
+
+# TODO: valadoc
+vdoc:
+	-rm -rf vdoc
+	cat vapi/*.vapi > .libr.vapi
+	valadoc -o vdoc .libr.vapi
+	-rm -f .libr.vapi
+	# rsync -avz vdoc/* pancake@radare.org:/srv/http/radareorg/vdoc/
+
+vdoc_pkg:
+	rm -rf vdoc
+	valadoc -o vdoc vapi/*.vapi
+	# rsync -avz vdoc/* pancake@radare.org:/srv/http/radareorg/vdoc/
+
 # TODO: make it less spaguetti
 perl:
 	@-[ "`grep perl supported.langs`" ] && cd perl && make
@@ -67,7 +88,15 @@ install-perl:
 	cp -rf perl/*libr* $$target/ ; \
 	fi
 
-install: install-python install-ruby install-perl install-lua
+install-vapi:
+	@${INSTALL_DIR} ${PFX}/share/vala/vapi
+	${INSTALL_DATA} vapi/*.vapi vapi/*.deps ${PFX}/share/vala/vapi
+
+install: install-python install-ruby install-perl install-lua install-vapi
+
+deinstall: uninstall
+uninstall:
+	cd vapi/ ; for a in *.vapi *.deps ; do rm -f ${PREFIX}/share/vala/vapi/$$a ; done
 
 oldtest:
 	sh do-swig.sh r_bp
@@ -78,5 +107,6 @@ clean:
 	cd perl && make clean
 	cd ruby && make clean
 	cd lua && make clean
+	cd vapi/t && ${MAKE} clean
 
 .PHONY: ruby lua python perl clean oldtest test all