Skip to content

Commit 5afebf6

Browse files
committed
Updated build scripts and dependencies
1 parent 5965ed8 commit 5afebf6

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

make/configure.mk

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ define pkgconfig =
7070

7171
$(if $($(name)_NAME), \
7272
$(if $($(name)_CFLAGS),, $(eval $(name)_CFLAGS := $(shell $(PKG_CONFIG) --cflags "$($(name)_NAME)"))) \
73-
$(if $($(name)_LDLAGS),, $(eval $(name)_LDFLAGS := $(shell $(PKG_CONFIG) --libs "$($(name)_NAME)"))) \
73+
$(if $($(name)_LDFLAGS),, $(eval $(name)_LDFLAGS := $(shell $(PKG_CONFIG) --libs "$($(name)_NAME)"))) \
7474
\
7575
$(if $(HOST_$(name)_CFLAGS),, $(eval HOST_$(name)_CFLAGS := $(shell $(HOST_PKG_CONFIG) --cflags "$($(name)_NAME)"))) \
76-
$(if $(HOST_$(name)_LDLAGS),, $(eval HOST_$(name)_LDFLAGS := $(shell $(HOST_PKG_CONFIG) --libs "$($(name)_NAME)"))) \
76+
$(if $(HOST_$(name)_LDFLAGS),, $(eval HOST_$(name)_LDFLAGS := $(shell $(HOST_PKG_CONFIG) --libs "$($(name)_NAME)"))) \
7777
)
7878

7979
$(if $($(name)_OBJ),, $(eval $(name)_OBJ :=))
@@ -84,9 +84,9 @@ define libconfig =
8484
$(eval name=$(1))
8585

8686
$(if $($(name)_NAME), \
87-
$(if $($(name)_LDLAGS),, $(eval $(name)_LDFLAGS := -l$($(name)_NAME))) \
87+
$(if $($(name)_LDFLAGS),, $(eval $(name)_LDFLAGS := -l$($(name)_NAME))) \
8888
\
89-
$(if $(HOST_$(name)_LDLAGS),, $(eval HOST_$(name)_LDFLAGS := -l$($(name)_NAME))) \
89+
$(if $(HOST_$(name)_LDFLAGS),, $(eval HOST_$(name)_LDFLAGS := -l$($(name)_NAME))) \
9090
)
9191

9292
$(if $($(name)_OBJ),, $(eval $(name)_OBJ :=))
@@ -97,7 +97,7 @@ define optconfig =
9797
$(eval name=$(1))
9898

9999
$(if $($(name)_NAME), \
100-
$(if $(HOST_$(name)_LDLAGS),, $(eval HOST_$(name)_LDFLAGS := $($(name)_LDFLAGS))) \
100+
$(if $(HOST_$(name)_LDFLAGS),, $(eval HOST_$(name)_LDFLAGS := $($(name)_LDFLAGS))) \
101101
)
102102

103103
$(if $($(name)_OBJ),, $(eval $(name)_OBJ :=))
@@ -118,7 +118,7 @@ define _modconfig =
118118
$(if $($(name)_TESTING),, $(eval $(name)_TESTING := 0))
119119
$(if $($(name)_BIN),, $(eval $(name)_BIN := $(TARGET_BUILDDIR)/$($(name)_NAME)))
120120
$(if $($(name)_CFLAGS),, $(eval $(name)_CFLAGS := "$(if $($(name)_INC_OPT),$($(name)_INC_OPT) ,-I )\"$($(name)_INC)\"" -D$(name)_BUILTIN$(if $(publisher), -D$(name)_PUBLISHER)))
121-
$(if $($(name)_LDLAGS),, $(eval $(name)_LDFLAGS :=))
121+
$(if $($(name)_LDFLAGS),, $(eval $(name)_LDFLAGS :=))
122122
$(if $($(name)_OBJ),, $(eval $(name)_OBJ := "$($(name)_BIN)/$($(name)_NAME).o"))
123123
$(if $($(name)_OBJ_TEST),, $(eval $(name)_OBJ_TEST := "$($(name)_BIN)/$($(name)_NAME)-test.o"))
124124
$(if $($(name)_MFLAGS),, $(eval $(name)_MFLAGS := $(if $(publisher),,"-D$(name)_BUILTIN -fvisibility=hidden")))
@@ -134,7 +134,7 @@ define _modconfig =
134134
$(if $(HOST_$(name)_TESTING),, $(eval HOST_$(name)_TESTING := 0))
135135
$(if $(HOST_$(name)_BIN),, $(eval HOST_$(name)_BIN := $(HOST_BUILDDIR)/$($(name)_NAME)))
136136
$(if $(HOST_$(name)_CFLAGS),, $(eval HOST_$(name)_CFLAGS := "$(if $($(name)_INC_OPT),$($(name)_INC_OPT) ,-I )\"$($(name)_INC)\"" -D$(name)_BUILTIN$(if $(publisher), -D$(name)_PUBLISHER)))
137-
$(if $(HOST_$(name)_LDLAGS),, $(eval HOST_$(name)_LDFLAGS :=))
137+
$(if $(HOST_$(name)_LDFLAGS),, $(eval HOST_$(name)_LDFLAGS :=))
138138
$(if $(HOST_$(name)_OBJ),, $(eval HOST_$(name)_OBJ := "$(HOST_$(name)_BIN)/$($(name)_NAME).o"))
139139
$(if $(HOST_$(name)_OBJ_TEST),,$(eval HOST_$(name)_OBJ_TEST:= "$(HOST_$(name)_BIN)/$($(name)_NAME)-test.o"))
140140
$(if $(HOST_$(name)_MFLAGS),, $(eval HOST_$(name)_MFLAGS := $(if $(publisher),,"-D$(name)_BUILTIN -fvisibility=hidden")))
@@ -190,7 +190,7 @@ define plugconfig =
190190
$(if $($(name)_TEST),, $(eval $(name)_TEST := $($(name)_PATH)/test))
191191
$(if $($(name)_BIN),, $(eval $(name)_BIN := $(TARGET_BUILDDIR)/$($(name)_NAME)))
192192
$(if $($(name)_CFLAGS),, $(eval $(name)_CFLAGS := "-I\"$($(name)_INC)\"" -D$(name)_BUILTIN$(if $(publisher), -D$(name)_PUBLISHER)))
193-
$(if $($(name)_LDLAGS),, $(eval $(name)_LDFLAGS :=))
193+
$(if $($(name)_LDFLAGS),, $(eval $(name)_LDFLAGS :=))
194194
$(if $($(name)_OBJ_META),, $(eval $(name)_OBJ_META := "$($(name)_BIN)/$($(name)_NAME)-meta.o"))
195195
$(if $($(name)_OBJ_DSP),, $(eval $(name)_OBJ_DSP := "$($(name)_BIN)/$($(name)_NAME)-dsp.o"))
196196
$(if $($(name)_OBJ_UI),, $(eval $(name)_OBJ_UI := "$($(name)_BIN)/$($(name)_NAME)-ui.o"))
@@ -206,7 +206,7 @@ define plugconfig =
206206
$(if $(HOST_$(name)_TEST),, $(eval HOST_$(name)_TEST := $(HOST_$(name)_PATH)/test))
207207
$(if $(HOST_$(name)_BIN),, $(eval HOST_$(name)_BIN := $(HOST_BUILDDIR)/$($(name)_NAME)))
208208
$(if $(HOST_$(name)_CFLAGS),, $(eval HOST_$(name)_CFLAGS := "-I\"$(HOST_$(name)_INC)\"" -D$(name)_BUILTIN$(if $(publisher), -D$(name)_PUBLISHER)))
209-
$(if $(HOST_$(name)_LDLAGS),, $(eval HOST_$(name)_LDFLAGS :=))
209+
$(if $(HOST_$(name)_LDFLAGS),, $(eval HOST_$(name)_LDFLAGS :=))
210210
$(if $(HOST_$(name)_OBJ_META),, $(eval HOST_$(name)_OBJ_META := "$(HOST_$(name)_BIN)/$($(name)_NAME)-meta.o"))
211211
$(if $(HOST_$(name)_OBJ_DSP),, $(eval HOST_$(name)_OBJ_DSP := "$(HOST_$(name)_BIN)/$($(name)_NAME)-dsp.o"))
212212
$(if $(HOST_$(name)_OBJ_UI),, $(eval HOST_$(name)_OBJ_UI := "$(HOST_$(name)_BIN)/$($(name)_NAME)-ui.o"))

0 commit comments

Comments
 (0)