Mercurial > hg > ucx / changeset

     1.1 --- a/Makefile	Fri Sep 06 13:28:05 2013 +0200
     1.2 +++ b/Makefile	Fri Sep 06 17:01:53 2013 +0200
     1.3 @@ -43,6 +43,8 @@
     1.4  include unix.mk
     1.5  include $(CONF).mk
     1.6  
     1.7 +all: ucx test
     1.8 +
     1.9  ucx: FORCE
    1.10  	cd ucx; $(MAKE) CONF=$(CONF) all
    1.11  	
    1.12 @@ -52,7 +54,7 @@
    1.13  run: FORCE test
    1.14  	./build/test$(APP_EXT)
    1.15  
    1.16 -install: ucx | $(PREFIX)/include/ucx $(PREFIX)/lib
    1.17 +install: ucx $(PREFIX)/lib $(PREFIX)/include/ucx
    1.18  	cp ./build/libucx$(LIB_EXT) $(PREFIX)/lib && \
    1.19          cp ./ucx/*.h $(PREFIX)/include/ucx
    1.20  

     2.1 --- a/test/Makefile	Fri Sep 06 13:28:05 2013 +0200
     2.2 +++ b/test/Makefile	Fri Sep 06 17:01:53 2013 +0200
     2.3 @@ -41,12 +41,14 @@
     2.4  
     2.5  OBJ = $(SRC:%.c=../build/%$(OBJ_EXT))
     2.6  
     2.7 -all: $(OBJ)
     2.8 +all: ../build/ ../build/test
     2.9 +
    2.10 +../build/test: $(OBJ)
    2.11  	$(LD) $(LDFLAGS) $(LOFLAGS)../build/test$(APP_EXT) $(OBJ) \
    2.12  		../build/libucx$(LIB_EXT)
    2.13  
    2.14 -../build/%$(OBJ_EXT): %.c | ../build
    2.15 +../build/%$(OBJ_EXT): %.c
    2.16  	$(CC) $(CFLAGS) -I../ $(COFLAGS)$@ $<
    2.17  
    2.18  ../build:
    2.19 -	$(MKDIR) $(MKDIRFLAGS) build
    2.20 +	$(MKDIR) $(MKDIRFLAGS) ../build/test

     3.1 --- a/ucx/Makefile	Fri Sep 06 13:28:05 2013 +0200
     3.2 +++ b/ucx/Makefile	Fri Sep 06 17:01:53 2013 +0200
     3.3 @@ -43,12 +43,12 @@
     3.4  
     3.5  OBJ = $(SRC:%.c=../build/ucx/%$(OBJ_EXT))
     3.6  
     3.7 -all: libucx
     3.8 +all: ../build/ucx ../build/libucx$(LIB_EXT)
     3.9  
    3.10 -libucx: $(OBJ)
    3.11 +../build/libucx$(LIB_EXT): $(OBJ)
    3.12  	$(AR) $(ARFLAGS) $(AOFLAGS)../build/libucx$(LIB_EXT) $(OBJ)
    3.13  
    3.14 -../build/ucx/%$(OBJ_EXT): %.c | ../build/ucx
    3.15 +../build/ucx/%$(OBJ_EXT): %.c
    3.16  	$(CC) $(CFLAGS) $(COFLAGS)$@ $<
    3.17  
    3.18  ../build/ucx: