diff options
| author | lexborisov <lex.borisov@gmail.com> | 2017-03-12 21:22:47 +0300 |
|---|---|---|
| committer | lexborisov <lex.borisov@gmail.com> | 2017-03-12 21:22:47 +0300 |
| commit | 0ccabbd8b6d8b61d66e935d2ec0b9416fe8fb4f7 (patch) | |
| tree | 3f63e1c1913261f3427b0855ee41d6c4fcf61be3 | |
| parent | b44c5d340a4309d1b186932915254e8f4c4b3fc0 (diff) | |
Fixes for https://github.com/lexborisov/Modest/issues/20
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | examples/Makefile | 2 | ||||
| -rw-r--r-- | include/mycore/myosi.h | 4 |
3 files changed, 7 insertions, 5 deletions
@@ -77,11 +77,13 @@ clean: $(MODEST_BUILD_MODULES_TARGET_CLEAN) rm -f $(call MODEST_LIBRARY_WITH_VERSION) && rm -f $(call MODEST_LIBRARY_STATIC) $(call MODEST_BUILD_CLEAN_AFTER) -clone: $(MODEST_BUILD_MODULES_TARGET_CLONE) - rm -rf $(INCLUDE_TMP) +clone: clean_api $(MODEST_BUILD_MODULES_TARGET_CLONE) find $(INCLUDE_DIR_API) -name "*.h" -exec sed -i '.bak' -E 's/^[ \t]*#[ \t]*include[ \t]*"([^"]+)"/#include <\1>/g' {} \; find $(INCLUDE_DIR_API) -name "*.h.bak" -exec rm -f {} \; +clean_api: + rm -rf $(INCLUDE_DIR_API) + create: mkdir -p $(BINARY_DIR_BASE) $(LIB_DIR_BASE) diff --git a/examples/Makefile b/examples/Makefile index 2f44e51..7730ed6 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -60,7 +60,7 @@ override LDLIBS += $(BINARY_LIBRARIES) #*************** BINARY_BUILD_EXECUTE ?= $(foreach dir,$(BINARY_BUILD_MODULES_TARGET),$($(dir)_objs)) BINARY_BUILD_EXECUTE_CLEAN := $(foreach path,$(BINARY_BUILD_EXECUTE),$(subst ./,,$(path))) -BINARY_BUILD_EXECUTE_TO_CLEAN := $(foreach path,$(BINARY_BUILD_EXECUTE_CLEAN),rm -f $(BINARY_TO_DIR)/$(path) $(BYNARY_UTILS_NEW_LINE)) +BINARY_BUILD_EXECUTE_TO_CLEAN := $(foreach path,$(BINARY_BUILD_EXECUTE_CLEAN),rm -rf $(BINARY_TO_DIR)/$(path) $(BYNARY_UTILS_NEW_LINE)) BINARY_BUILD_DIRS_TO_CLEAN := $(foreach path,$(BINARY_BUILD_MODULES_LIST),rm -rf $(BINARY_TO_DIR)/$(path) $(BYNARY_UTILS_NEW_LINE)) BINARY_BUILD_EXECUTE_COPY := $(foreach path,$(BINARY_BUILD_EXECUTE_CLEAN),cp $(path) $(BINARY_TO_DIR)/$(dir $(path)) $(BYNARY_UTILS_NEW_LINE)) BINARY_BUILD_EXECUTE_COPY_ALL := $(BINARY_UTILS_CREATE_DIRS) $(BINARY_BUILD_EXECUTE_COPY) diff --git a/include/mycore/myosi.h b/include/mycore/myosi.h index ab50135..af4be67 100644 --- a/include/mycore/myosi.h +++ b/include/mycore/myosi.h @@ -29,8 +29,8 @@ #include <stdint.h> #include <inttypes.h> -#define MyCORE_VERSION_MAJOR 1 -#define MyCORE_VERSION_MINOR 0 +#define MyCORE_VERSION_MAJOR 0 +#define MyCORE_VERSION_MINOR 1 #define MyCORE_VERSION_PATCH 0 //#define MyCORE_BUILD_WITHOUT_THREADS |