Move grub into shlr

libr/fs/Makefile

@@ -3,7 +3,8 @@ DEPS=r_lib r_util r_io
 CFLAGS+=-DCORELIB -Iarch/include -Iarch
 
 CFLAGS+=-Ip/grub/include
-LDFLAGS+=p/grub/libgrubfs.a
+SHLR=../../shlr/
+LDFLAGS+=$(SHLR)/grub/libgrubfs.a
 
 include ../config.mk
 
@@ -16,8 +17,8 @@ STATIC_OBJS=$(subst ..,p/..,$(subst fs_,p/fs_,$(STATIC_OBJ)))
 OBJS=${STATIC_OBJS} fs.o file.o 
 #p/grub/main.o
 
-p/grub/libgrubfs.a:
-	cd p/grub && ${MAKE} libgrubfs.a CC="${CC}"
+#p/grub/libgrubfs.a:
+#	cd p/grub && ${MAKE} libgrubfs.a CC="${CC}"
 
 pre: 
 	cd d && ${MAKE}
@@ -35,7 +36,7 @@ test:
 	gdb --args r2 -i test.rsc /tmp/test.fs.img
 
 plugins:
-	cd p/grub && ${MAKE} libgrubfs.a CC="${CC}"
+	#cd p/grub && ${MAKE} libgrubfs.a CC="${CC}"
 	cd p && ${MAKE} all
 
 include ../rules.mk

libr/fs/fs.c

@@ -4,7 +4,7 @@
 #include "../config.h"
 #include "types.h"
 #include <errno.h>
-#include "p/grub/include/grub/msdos_partition.h"
+#include "../../shlr/grub/include/grub/msdos_partition.h"
 
 R_LIB_VERSION(r_fs);
 
@@ -389,7 +389,7 @@ R_API RFSFile *r_fs_slurp(RFS* fs, const char *path) {
 }
 
 // TODO: move into grubfs
-#include "p/grub/include/grubfs.h"
+#include "../../shlr/grub/include/grubfs.h"
 RList *list = NULL;
 static int parhook (struct grub_disk *disk, struct grub_partition *par, void *closure) {
 	RFSPartition *p = r_fs_partition_new (r_list_length (list), par->start*512, 512*par->len);

libr/fs/p/Makefile

@@ -1,6 +1,7 @@
 include ../../config.mk
 
-CFLAGS+=-I../../include -Wall -shared -fPIC ${LDFLAGS_LIB} ${LDFLAGS_LINKPATH}..
+CFLAGS+=-I$(LIBR)/include -Wall -shared -fPIC ${LDFLAGS_LIB} ${LDFLAGS_LINKPATH}..
+GRUB=$(LIBR)../shlr/grub/libgrub.a
 #CFLAGS+=-I../../include
 LDFLAGS+=${LINK}
 
@@ -13,11 +14,9 @@ FILESYSTEMS=ext2.mk fat.mk ntfs.mk reiserfs.mk tar.mk udf.mk ufs2.mk ufs.mk xfs.
 include $(FILESYSTEMS)
 
 all:
-	cd grub && ${MAKE} lib
 
 clean:
 	-rm -f *.${EXT_SO} *.o ${STATIC_OBJ}
-	cd grub && ${MAKE} clean
 
 mrproper: clean
 	-rm -f *.d ../arch/*/*/*.d

libr/fs/p/cpio.mk

@@ -1,6 +1,6 @@
 OBJ_CPIO=fs_cpio.o
-EXTRA=../p/grub/libgrubfs.a
-CFLAGS+=-Igrub/include
+EXTRA=$(GRUB)
+CFLAGS+=-I$(SHLR)/grub/include
 
 STATIC_OBJ+=${OBJ_CPIO}
 #STATIC_OBJ+=${EXTRA}

libr/fs/p/ext2.mk

@@ -1,5 +1,5 @@
 OBJ_EXT2=fs_ext2.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_EXT2}

libr/fs/p/fat.mk

@@ -1,5 +1,5 @@
 OBJ_FAT=fs_fat.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_FAT}

libr/fs/p/fb.mk

@@ -1,5 +1,5 @@
 OBJ_FB=fs_fb.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_FB}

libr/fs/p/hfs.mk

@@ -1,5 +1,5 @@
 OBJ_HFS=fs_hfs.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_HFS}

libr/fs/p/hfsplus.mk

@@ -1,5 +1,5 @@
 OBJ_HFSPLUS=fs_hfsplus.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_HFSPLUS}

libr/fs/p/iso9660.mk

@@ -1,5 +1,5 @@
 OBJ_ISO9660=fs_iso9660.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_ISO9660}

libr/fs/p/jfs.mk

@@ -1,5 +1,5 @@
 OBJ_JFS=fs_jfs.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_JFS}

libr/fs/p/minix.mk

@@ -1,5 +1,5 @@
 OBJ_MINIX=fs_minix.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_MINIX}

libr/fs/p/ntfs.mk

@@ -1,5 +1,5 @@
 OBJ_NTFS=fs_ntfs.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_NTFS}

libr/fs/p/reiserfs.mk

@@ -1,5 +1,5 @@
 OBJ_REISERFS=fs_reiserfs.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_REISERFS}

libr/fs/p/sfs.mk

@@ -1,5 +1,5 @@
 OBJ_SFS=fs_sfs.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_SFS}

libr/fs/p/tar.mk

@@ -1,5 +1,5 @@
 OBJ_TAR=fs_tar.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_TAR}

libr/fs/p/udf.mk

@@ -1,5 +1,5 @@
 OBJ_UDF=fs_udf.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_UDF}

libr/fs/p/ufs.mk

@@ -1,5 +1,5 @@
 OBJ_UFS=fs_ufs.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_UFS}

libr/fs/p/ufs2.mk

@@ -1,5 +1,5 @@
 OBJ_UFS2=fs_ufs2.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_UFS2}

libr/fs/p/xfs.mk

@@ -1,5 +1,5 @@
 OBJ_XFS=fs_xfs.o
-EXTRA=../p/grub/libgrubfs.a
+EXTRA=$(GRUB)
 CFLAGS+=-Igrub/include
 
 STATIC_OBJ+=${OBJ_XFS}

shlr/Makefile

@@ -2,7 +2,7 @@ include ../config-user.mk
 include ../mk/${COMPILER}.mk
 
 HOST_CC?=gcc
-MODS=udis86 java tcc zip
+MODS=udis86 java tcc zip grub
 URL=git://github.com/radare/sdb
 PWD=$(shell pwd)
 SDB_CONFIG=${PWD}/sdb-config.mk

shlr/grub/Makefile

@@ -1,8 +1,8 @@
-include ../../../config.mk
+#include ../config.mk
 #CC?=gcc
 CC?=gcc
 #OSTYPE=$(shell uname -s)
-include ../../../../config-user.mk
+include ../../config-user.mk
 RANLIB?=ranlib
 ifeq (${OSTYPE},)
 all:
@@ -53,7 +53,7 @@ KERNFILES+=partmap/sunpc.c
 
 KERNOBJS=$(subst .c,.o,${KERNFILES})
 CFLAGS+=-Iinclude -fPIC 
-CFLAGS+=-I../../../include -DGRUB_TARGET_NO_MODULES
+CFLAGS+=-I../../libr/include -DGRUB_TARGET_NO_MODULES
 CFLAGS+=-g
 
 # This fixes a silly GNU gcc build problem in OSX - BLAME! :D
@@ -64,6 +64,7 @@ endif
 BIN=test${EXT_EXE}
 
 all: ${KERNOBJS}
+	${MAKE} libgrubfs.a
 
 ${BIN}: ${KERNOBJS} main.o
 	${CC} -o ${BIN} main.o ${CFLAGS} ${KERNOBJS}