Skip to content
This repository has been archived by the owner on Jun 27, 2019. It is now read-only.

Commit

Permalink
build: cleanup static modules
Browse files Browse the repository at this point in the history
We don't use or need static modules any more, this was useful when we
first had the libshared.a to share code between bin, tests and so
on. Now it becomes obsolete and shouldn't be maintained.

Signed-off-by: Leandro Dorileo <leandro.maciel.dorileo@intel.com>
  • Loading branch information
Leandro Dorileo committed Sep 3, 2015
1 parent 3090e04 commit 8172964
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 16 deletions.
18 changes: 3 additions & 15 deletions tools/build/Makefile.rules
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,9 @@ parse-builtin-module = \
$(eval builtin-flow-metatype += $(1))) \

parse-mod-output = \
$(if $(filter yes,$(obj-$(1)-static)), \
$(eval $(3)-out := $(addprefix $(subst $(top_srcdir)src/,$(build_stagedir),$(subdir)),$(1)).a) \
$(eval mod-ar += $(1)), \
$(eval out-prefix := $(build_modulesdir)$(strip $(call module-type,$(2)))) \
$(eval $(3)-out := $(out-prefix)/$(1).so) \
$(eval mod-so += $(3)) \
) \
$(eval out-prefix := $(build_modulesdir)$(strip $(call module-type,$(2)))) \
$(eval $(3)-out := $(out-prefix)/$(1).so) \
$(eval mod-so += $(3)) \

parse-mod-module = \
$(call parse-common-module,$(1),$(2),m,$(3)) \
Expand Down Expand Up @@ -339,14 +335,6 @@ $($(1)-out): $(SOL_LIB_OUTPUT) $($(1)-objs) $(call find-deps,$(1)) $($(1)-bs)
endef
$(foreach curr,$(mod-so),$(eval $(call make-mod-so,$(curr))))

define make-mod-ar
$($(1)-out): $($(1)-objs) $(call find-deps,$(1)) $($(1)-bs)
$(Q)echo " "AR" "$$@
$(Q)$(MKDIR) -p $(dir $($(1)-out))
$(Q)$(TARGETAR) $(TARGET_ARFLAGS) $($(1)-out) $($(1)-objs)
endef
$(foreach curr,$(mod-ar),$(eval $(call make-mod-ar,$(curr))))

$(SOL_LIB_AR): $(all-objs)
$(Q)echo " "AR" "$(@)
$(Q)$(MKDIR) -p $(dir $(SOL_LIB_AR))
Expand Down
1 change: 0 additions & 1 deletion tools/build/Makefile.vars
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ modules-linux-micro :=
# module objects, deps and configs lookup variables
modules :=
modules-out :=
mod-ar :=
mod-so :=

# binary lookup variables
Expand Down

0 comments on commit 8172964

Please sign in to comment.