On 2018-04-13 10:18 +0100, Mike Leach wrote:
The final upstream patchset will contain additional stuff (some expanded user docs and a couple of source fixes that have been made since 0.8.1), but if you could check that this set doesn't break the packaging build, then we will be almost there.
Whilst checking everything was as it should be, I noticed one more minor issue: The tests buildir (LIB_TEST_TARGET_DIR) is not cleaned up:
It could be fixed in this rather crude way in the main makefile:
Index: libopencsd-0.8.3~pre/decoder/build/linux/makefile =================================================================== --- libopencsd-0.8.3~pre.orig/decoder/build/linux/makefile +++ libopencsd-0.8.3~pre/decoder/build/linux/makefile @@ -187,6 +187,7 @@ clean_tests: cd $(OCSD_ROOT)/tests/build/linux/snapshot_parser_lib && make clean cd $(OCSD_ROOT)/tests/build/linux/trc_pkt_lister && make clean cd $(OCSD_ROOT)/tests/build/linux/c_api_pkt_print_test && make clean + -rm -r $(OCSD_TESTS)/lib
clean_docs: -rm -r $(OCSD_ROOT)/docs/html
But this is probably a more 'correct/modular' fix:
Index: libopencsd-0.8.3~pre/decoder/tests/build/linux/echo_test_dcd_lib/makefile =================================================================== --- libopencsd-0.8.3~pre.orig/decoder/tests/build/linux/echo_test_dcd_lib/makefile +++ libopencsd-0.8.3~pre/decoder/tests/build/linux/echo_test_dcd_lib/makefile @@ -79,6 +79,6 @@ clean: -rm $(OBJECTS) -rm $(LIB_TEST_TARGET_DIR)/$(LIB_NAME).a -rm $(DEPS) - -rmdir $(BUILD_DIR) + -rmdir $(BUILD_DIR) $(LIB_TEST_TARGET_DIR)
# end of file makefile Index: libopencsd-0.8.3~pre/decoder/tests/build/linux/snapshot_parser_lib/makefile =================================================================== --- libopencsd-0.8.3~pre.orig/decoder/tests/build/linux/snapshot_parser_lib/makefile +++ libopencsd-0.8.3~pre/decoder/tests/build/linux/snapshot_parser_lib/makefile @@ -89,4 +89,4 @@ clean: -rm $(OBJECTS) -rm $(DEPS) -rm $(LIB_TEST_TARGET_DIR)/$(LIB_NAME).a - -rmdir $(BUILD_DIR) + -rmdir $(BUILD_DIR) $(LIB_TEST_TARGET_DIR) Index: libopencsd-0.8.3~pre/decoder/build/linux/makefile =================================================================== --- libopencsd-0.8.3~pre.orig/decoder/build/linux/makefile +++ libopencsd-0.8.3~pre/decoder/build/linux/makefile @@ -187,6 +187,7 @@ clean_tests: cd $(OCSD_ROOT)/tests/build/linux/snapshot_parser_lib && make clean cd $(OCSD_ROOT)/tests/build/linux/trc_pkt_lister && make clean cd $(OCSD_ROOT)/tests/build/linux/c_api_pkt_print_test && make clean + -rmdir $(OCSD_TESTS)/lib
clean_docs: -rm -r $(OCSD_ROOT)/docs/html
Wookey