Fix build (R)

This commit is contained in:
pancake 2012-09-26 23:58:55 +02:00
parent 7cdb0dc0d7
commit dba5de4416
4 changed files with 6 additions and 7 deletions

View File

@ -1,5 +1,5 @@
include ../../../global.mk
SDB=../../db/sdb/src/sdb
SDB=$(LTOP)/db/sdb/src/sdb
all: dospart.sdb
@ -14,7 +14,7 @@ ${SDB}:
cp -rf $(LTOP)/db/sdb/src $(LTOP)/db/sdb/src-native
#cd $(LTOP)/db/sdb/src-native && ${MAKE} -j ${MAKE_JOBS} ARCH=xxx CC=gcc clean sdb
cd $(LTOP)/db/sdb/src-native && ${MAKE} -j 1 ARCH=xxx CC=gcc clean sdb
cp -f $(LTOP)/db/sdb/src-native/sdb $(LTOP)/db/sdb/sdb
cp -f $(LTOP)/db/sdb/src-native/sdb $(SDB)
rm -rf $(LTOP)/db/sdb/src-native
.PHONY: all clean

View File

@ -24,9 +24,7 @@ LDFLAGS+=-lwsock32
endif
STATIC_OBJS=
# include ../config.mk
include $(TOP)/libr/rules.mk
include $(TOP)/libr/config.mk
foo:
for a in pre libr_io.${EXT_SO} libr_io.${EXT_AR} tests plugins ; do ${MAKE} $$a ; done
@ -45,3 +43,5 @@ tests:
plugins:
cd p && ${MAKE} all
include $(TOP)/libr/rules.mk

View File

@ -49,7 +49,6 @@ LDFLAGS+=$(addprefix -L$(TOP)/libr/,$(X))
LDFLAGS+=$(addprefix -l,$(DEPS))
ifeq ($(WITHPIC),1)
${LIBSO}: $(EXTRA_TARGETS) waitfordeps ${OBJ} ${SHARED_OBJ}
echo LDFLAGS=$(LDFLAGS)
@for a in ${OBJ} ${SHARED_OBJ} ${SRC}; do \
do=0 ; [ ! -e ${LIBSO} ] && do=1 ; \
test $$a -nt ${LIBSO} && do=1 ; \

View File

@ -18,7 +18,7 @@ include $(TOP)/config-user.mk
F_SDB=$(addsuffix .sdb,$F)
SDB=../../db/sdb/sdb
SDB=$(LTOP)/db/sdb/sdb
all: ${SDB}
@${MAKE} compile