1.1 --- a/ucx/Makefile Thu Sep 05 13:55:04 2013 +0200 1.2 +++ b/ucx/Makefile Fri Sep 06 13:20:20 2013 +0200 1.3 @@ -26,6 +26,7 @@ 1.4 # POSSIBILITY OF SUCH DAMAGE. 1.5 # 1.6 1.7 +include ../unix.mk 1.8 include ../$(CONF).mk 1.9 1.10 # list of source files 1.11 @@ -40,15 +41,15 @@ 1.12 SRC += logging.c 1.13 SRC += buffer.c 1.14 1.15 -OBJ = $(SRC:%.c=../build/%.$(OBJ_EXT)) 1.16 +OBJ = $(SRC:%.c=../build/ucx/%$(OBJ_EXT)) 1.17 1.18 all: libucx 1.19 1.20 libucx: $(OBJ) 1.21 - $(AR) $(ARFLAGS) $(AOFLAGS)../build/libucx.$(LIB_EXT) $(OBJ) 1.22 + $(AR) $(ARFLAGS) $(AOFLAGS)../build/libucx$(LIB_EXT) $(OBJ) 1.23 1.24 -../build/%.$(OBJ_EXT): %.c ../build 1.25 +../build/ucx/%$(OBJ_EXT): %.c | ../build/ucx 1.26 $(CC) $(CFLAGS) $(COFLAGS)$@ $< 1.27 1.28 -../build: 1.29 - mkdir -p ../build 1.30 +../build/ucx: 1.31 + $(MKDIR) $(MKDIRFLAGS) ../build/ucx