1.1 --- a/Makefile Fri Sep 06 17:01:53 2013 +0200
1.2 +++ b/Makefile Mon Sep 09 10:48:08 2013 +0200
1.3 @@ -29,33 +29,43 @@
1.4
1.5 #
1.6 # available configurations:
1.7 -# clang, clang-debug
1.8 -# gcc, gcc-debug
1.9 -# g++, g++-debug
1.10 -# osx, osx-debug
1.11 -# suncc, suncc-debug
1.12 +# clang
1.13 +# gcc
1.14 +# g++
1.15 +# osx
1.16 +# suncc
1.17 # windows
1.18 #
1.19
1.20 CONF=gcc
1.21 PREFIX=/usr/local
1.22
1.23 -include unix.mk
1.24 include $(CONF).mk
1.25
1.26 all: ucx test
1.27
1.28 ucx: FORCE
1.29 - cd ucx; $(MAKE) CONF=$(CONF) all
1.30 + cd ucx; $(MAKE) CONF=$(CONF)
1.31 +
1.32 +ucx-debug: FORCE
1.33 + cd ucx; $(MAKE) CONF=$(CONF) debug
1.34
1.35 test: FORCE ucx
1.36 - cd test; $(MAKE) CONF=$(CONF) all
1.37 + cd test; $(MAKE) CONF=$(CONF)
1.38 +
1.39 +test-debug: FORCE ucx-debug
1.40 + cd test; $(MAKE) CONF=$(CONF) debug
1.41
1.42 run: FORCE test
1.43 - ./build/test$(APP_EXT)
1.44 + ./build/release/test/ucxtest$(APP_EXT)
1.45 +
1.46 +run-debug: FORCE test-debug
1.47 + ./build/debug/test/ucxtest$(APP_EXT)
1.48 +
1.49 +debug: ucx-debug test-debug
1.50
1.51 install: ucx $(PREFIX)/lib $(PREFIX)/include/ucx
1.52 - cp ./build/libucx$(LIB_EXT) $(PREFIX)/lib && \
1.53 + cp ./build/release/libucx$(LIB_EXT) $(PREFIX)/lib && \
1.54 cp ./ucx/*.h $(PREFIX)/include/ucx
1.55
1.56 uninstall:
