Commit eb4d823b authored by Jamie A. Jennings's avatar Jamie A. Jennings

Removed CLIENTS; fixed libbsdtest; added a libclean target

parent abad2a89
......@@ -21,7 +21,7 @@
# $DESTDIR/lib/rosie/ (rosie files needed at runtime)
# $DESTDIR/bin/rosie (cli)
#
# 'make test CLIENTS=all' runs all of the blackbox and whitebox tests.
# 'make test' runs all of the blackbox and whitebox tests.
# For the tests to execute, rosie must have been built with as follows:
# 'make LUADEBUG=1'
#
......@@ -147,7 +147,7 @@ readlinetest:
# error message.
.PHONY: libbsdtest
libbsdtest:
@(bash -c 'printf "#if defined(__GNUC__)\n#if !defined(__clang__)\n#include <bsd/stdio.h>\n#endif\n#endif\nint main() { }\n"' | \
@(bash -c 'printf "#if defined(__linux__)\n#if !defined(__clang__)\n#include <bsd/stdio.h>\n#endif\n#endif\nint main() { }\n"' | \
$(CC) -std=c99 -o /dev/null -xc -) && \
echo 'libbsd TEST: bsd/stdio.h appears to be installed (or is not needed)' || \
(echo '**'; echo '** libbsd TEST: Missing bsd/stdio.h. Try running: apt-get install libbsd'; echo '**' && /usr/bin/false)
......@@ -181,13 +181,6 @@ $(LUA_DIR)/src/lua: $(submodules)
## ----------------------------------------------------------------------------------------
# .PHONY: rpeg
# rpeg: libbsdtest
# $(MAKE) -C "$(RPEG_DIR)" CC=$(CC) LUADIR=../../$(LUA)
# @$(BUILD_ROOT)/src/build_info.sh "rpeg" $(BUILD_ROOT) $(CC) >> $(BUILD_ROOT)/build.log
## ----------------------------------------------------------------------------------------
json_lib=$(JSON_DIR)/cjson.so
lib/cjson.so: $(json_lib)
......@@ -396,21 +389,19 @@ test:
fi;
@echo Running tests in test/all.lua
@(TERM="dumb"; echo "dofile \"$(BUILD_ROOT)/test/all.lua\"" | $(ROSIEBIN) -D)
@if [ -n "$(CLIENTS)" ]; then \
echo "** Running librosie client tests **"; \
$(MAKE) -C "$(LIBROSIE_DIR)" test; \
else \
echo "Skipping librosie client tests."; \
echo "To enable, set CLIENTS=all or CLIENTS=\"C python\" or such (space separated list in quotes)."; \
fi
.PHONY: clean
clean:
rm -rf bin/* lib/* librosie.so librosie.dylib librosie.a
$(MAKE) -C "$(RPEG_DIR)" clean
clean: libclean
rm -rf bin/* lib/*
-cd $(LUA_DIR) && make clean
-cd $(JSON_DIR) && make clean
-cd $(READLINE_DIR) && rm -f readline.so && rm -f src/lua_readline.o
-cd $(LIBROSIE_DIR) && make clean
rm -f build.log
.PHONY: libclean
libclean:
rm -rf librosie.so librosie.dylib librosie.a
$(MAKE) -C "$(RPEG_DIR)" clean
-cd $(LIBROSIE_DIR) && make clean
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment