Index: libopencsd-0.8.0/decoder/tests/build/linux/c_api_pkt_print_test/makefile
===================================================================
--- libopencsd-0.8.0.orig/decoder/tests/build/linux/c_api_pkt_print_test/makefile
+++ libopencsd-0.8.0/decoder/tests/build/linux/c_api_pkt_print_test/makefile
@@ -88,5 +88,7 @@ $(BUILD_DIR)/%.o : %.c
 clean :
 	rm -f  $(BIN_TEST_TARGET_DIR)/$(PROG) $(OBJECTS)
 	rm -f  $(DEPS)
+	-rmdir $(BUILD_DIR)
+	-rm ./*.so
 
 # end of file makefile
Index: libopencsd-0.8.0/decoder/tests/build/linux/echo_test_dcd_lib/makefile
===================================================================
--- libopencsd-0.8.0.orig/decoder/tests/build/linux/echo_test_dcd_lib/makefile
+++ libopencsd-0.8.0/decoder/tests/build/linux/echo_test_dcd_lib/makefile
@@ -84,5 +84,6 @@ clean:
 	rm -f $(OBJECTS)
 	rm -f $(LIB_TEST_TARGET_DIR)/$(LIB_NAME).a
 	rm -f $(DEPS)
+	-rmdir $(BUILD_DIR)
 
 # end of file makefile
Index: libopencsd-0.8.0/decoder/tests/build/linux/snapshot_parser_lib/makefile
===================================================================
--- libopencsd-0.8.0.orig/decoder/tests/build/linux/snapshot_parser_lib/makefile
+++ libopencsd-0.8.0/decoder/tests/build/linux/snapshot_parser_lib/makefile
@@ -90,3 +90,4 @@ clean:
 	rm -f $(OBJECTS)
 	rm -f $(DEPS)
 	rm -f $(LIB_TEST_TARGET_DIR)/$(LIB_NAME).a
+	-rmdir $(BUILD_DIR)
Index: libopencsd-0.8.0/decoder/tests/build/linux/trc_pkt_lister/makefile
===================================================================
--- libopencsd-0.8.0.orig/decoder/tests/build/linux/trc_pkt_lister/makefile
+++ libopencsd-0.8.0/decoder/tests/build/linux/trc_pkt_lister/makefile
@@ -87,5 +87,7 @@ $(BUILD_DIR)/%.o : %.cpp
 clean :
 			rm -f  $(BIN_TEST_TARGET_DIR)/$(PROG) $(OBJECTS)
 			rm -f  $(DEPS)
+			-rmdir $(BUILD_DIR)
+			-rm $(BIN_TEST_TARGET_DIR)/*.so
 
 # end of file makefile