* Do not link libr2.dylib in OSX

  - Adapt -Wl,-R -> -L in OSX
* Comment some useless mk includes

global.mk

@@ -1,6 +1,5 @@
 RELEASE=1
 DESTDIR=
-OSTYPE?= # woot
 
 COMPILER?=gcc
 #COMPILER=mingw32-gcc
@@ -23,7 +22,9 @@ LIBDIR=${PREFIX}/lib
 -include config-user.mk
 -include ../config-user.mk
 -include ../../config-user.mk
+-include ../../../config-user.mk
 
 -include mk/${COMPILER}.mk
 -include ../mk/${COMPILER}.mk
 -include ../../mk/${COMPILER}.mk
+-include ../../../mk/${COMPILER}.mk

libr/Makefile

@@ -27,7 +27,11 @@ libr: .objs libr2.${EXT_SO} libr2.${EXT_AR}
 
 ifeq ($(WITHPIC),1)
 libr2.${EXT_SO}:
+ifeq ($(OSTYPE),darwin)
+	@echo Linkage of libr2.dylib is broken on OSX because of dupped .o in .objs extraction
+else
 	${CC} ${LDFLAGS_LIB} ${PIC_CFLAGS} .objs/*.o -o libr2.${EXT_SO}
+endif
 
 libr2.${EXT_AR}:
 	@echo No archive libr.a. Try --without-pic in configure

libr/config.mk.tail

@@ -23,7 +23,11 @@ LDFLAGS+=$(subst r_,-lr_,$(DEPS))
 LDFLAGS+=$(subst r_,-L../,$(DEPS))
 LDFLAGS+=$(subst r_,-lr_,$(BINDEPS))
 LDFLAGS+=$(subst r_,-L../../,$(BINDEPS))
+ifeq ($(OSTYPE),darwin)
+BOO=-L../../
+else
 BOO=-Wl,-R../../
+endif
 LDFLAGS+=$(subst r_,${BOO},$(BINDEPS))
 CFLAGS+=${PIC_CFLAGS}
 LDFLAGS+=${PIC_CFLAGS}

libr/rules.mk

@@ -2,11 +2,9 @@
 -include config.mk
 -include ../config.mk
 -include ../../config.mk
--include global.mk
--include ../global.mk
--include ../../global.mk
--include ../../mk/${COMPILER}.mk
--include ../../../mk/${COMPILER}.mk
+
+#-include ../global.mk
+#-include ../../global.mk
 
 #-------------------------------------#
 # Rules for libraries
@@ -85,8 +83,8 @@ else
 # Rules for test programs
 
 # XXX can this be removed?
-include ../../../config-user.mk
-include ../../../mk/${COMPILER}.mk
+#include ../../../config-user.mk
+#include ../../../mk/${COMPILER}.mk
 
 CFLAGS+=-I../../include -DVERSION=\"${VERSION}\"