Commit 8e149bca authored by Michal 'vorner' Vaner's avatar Michal 'vorner' Vaner

Typo & other fixes

• Remove duplicate flags from the compilation (include $(2)_CFLAGS and
  $(2)_LDFLAGS only once in the command)
• Typo in STATIC_LOCAL variable name, preventing static linking from
  working.
parent f9f0c853
......@@ -29,7 +29,7 @@ LDFLAGS_ALL += $(LDFLAGS)
ifdef STATIC
STATIC_LOCAL := 1
STACIC_SYSTEM := 1
STATIC_SYSTEM := 1
endif
ifdef STATIC_LOCAL
CFLAGS_ALL += -static -DSTATIC
......@@ -63,8 +63,6 @@ define COMMON_REGISTER
$(1): $$(patsubst %,$(O)/.objs/$(3)%.o,$$($(2)_MODULES))
$(1): CFLAGS_ALL += $$($(2)_CFLAGS) $$(foreach CONFIG,$$($(2)_PKG_CONFIGS),$$(shell pkg-config --cflags $$(CONFIG))) $$(foreach CONFIG,$$($(2)_EXE_CONFIGS),$$(shell $$(CONFIG)-config --cflags))
$(1): LDFLAGS_ALL += $$($(2)_LDFLAGS) $$(foreach CONFIG,$$($(2)_PKG_CONFIGS),$$(shell pkg-config --libs $$(CONFIG))) $$(foreach CONFIG,$$($(2)_EXE_CONFIGS),$$(shell $$(CONFIG)-config --libs))
$(1): CFLAGS_ALL += $$($(2)_CFLAGS)
$(1): LDFLAGS_ALL += $$($(2)_LDFLAGS)
ifdef STATIC_LOCAL
$(1): LINK_LIBRARIES += $$(patsubst %,$(O)/lib/lib%.a,$$($(2)_LOCAL_LIBS))
$(1): $$(patsubst %,$(O)/lib/lib%.a,$$($(2)_LOCAL_LIBS))
......
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