# HG changeset patch # User Olaf Wintermann # Date 1325343248 -3600 # Node ID 20c788d1e2784c14c6cc7cc88cf9ed7bd9a2d167 # Parent 1e4522fddff041016b67842ddb9071718ea14017 Moved object files to build/ diff -r 1e4522fddff0 -r 20c788d1e278 Makefile --- a/Makefile Sat Dec 31 14:04:40 2011 +0100 +++ b/Makefile Sat Dec 31 15:54:08 2011 +0100 @@ -50,11 +50,10 @@ cd test; $(MAKE) CONF=$(CONF) all run: FORCE test - ./test/test$(APP_EXT) + ./build/test$(APP_EXT) clean: FORCE - $(RM) $(RMFLAGS) ucx/*.$(OBJ_EXT) ucx/*.$(LIB_EXT) - $(RM) $(RMFLAGS) test/*.$(OBJ_EXT) test/test$(APP_EXT) + $(RM) $(RMFLAGS) build/* FORCE: diff -r 1e4522fddff0 -r 20c788d1e278 test/Makefile --- a/test/Makefile Sat Dec 31 14:04:40 2011 +0100 +++ b/test/Makefile Sat Dec 31 15:54:08 2011 +0100 @@ -30,13 +30,13 @@ SRC = main.c -OBJ = $(SRC:%.c=%.$(OBJ_EXT)) +OBJ = $(SRC:%.c=../build/%.$(OBJ_EXT)) -all: test1 +all: ../build/test1 -test1: $(OBJ) - $(LD) $(LDFLAGS) -o test$(APP_EXT) $(OBJ) ../ucx/libucx.a +../build/test1: $(OBJ) + $(LD) $(LDFLAGS) -o ../build/test$(APP_EXT) $(OBJ) ../build/libucx.a -%.$(OBJ_EXT): %.c - $(CC) $(CFLAGS) -I../ -c $< +../build/%.$(OBJ_EXT): %.c + $(CC) $(CFLAGS) -I../ -o $@ -c $< diff -r 1e4522fddff0 -r 20c788d1e278 ucx/Makefile --- a/ucx/Makefile Sat Dec 31 14:04:40 2011 +0100 +++ b/ucx/Makefile Sat Dec 31 15:54:08 2011 +0100 @@ -31,13 +31,13 @@ # list of source files SRC = -OBJ = $(SRC:%.c=%.$(OBJ_EXT)) +OBJ = $(SRC:%.c=../build/%.$(OBJ_EXT)) all: libucx libucx: $(OBJ) - $(AR) $(ARFLAGS) libucx.$(LIB_EXT) $(OBJ) + $(AR) $(ARFLAGS) ../build/libucx.$(LIB_EXT) $(OBJ) -%.$(OBJ_EXT): %.c - $(CC) $(CFLAGS) -c $< +../build/%.$(OBJ_EXT): %.c + $(CC) $(CFLAGS) -c $< -o $@