Skip to content

Commit ce79f7b

Browse files
committed
made a change to avoid duplication of LDFLAGS
1 parent 1ab6e15 commit ce79f7b

File tree

6 files changed

+7
-3
lines changed

6 files changed

+7
-3
lines changed

doc/demo/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@ TPL-_meta_demodb=bin_target
413413
IN-_meta_demodb= \
414414
main.meta.o \
415415
demodb.meta.o
416+
LDFLAGS-_meta_demodb=-Lsrc -lmetac
416417
POST-_meta_demodb=$(METAC_POST_META)
417418

418419
TPL-demodb.reflect.c:=metac_target

doc/demo/step_03/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ TPL-_meta_demodb=bin_target
4040
IN-_meta_demodb= \
4141
main.meta.o \
4242
demodb.meta.o
43+
LDFLAGS-_meta_demodb=-Lsrc -lmetac
4344
POST-_meta_demodb=$(METAC_POST_META)
4445

4546
TPL-demodb.reflect.c:=metac_target

doc/demo/step_04/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ TPL-_meta_demodb=bin_target
4040
IN-_meta_demodb= \
4141
main.meta.o \
4242
demodb.meta.o
43+
LDFLAGS-_meta_demodb=-Lsrc -lmetac
4344
POST-_meta_demodb=$(METAC_POST_META)
4445

4546
TPL-demodb.reflect.c:=metac_target

doc/demo/step_05/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ TPL-_meta_demodb=bin_target
4040
IN-_meta_demodb= \
4141
main.meta.o \
4242
demodb.meta.o
43+
LDFLAGS-_meta_demodb=-Lsrc -lmetac
4344
POST-_meta_demodb=$(METAC_POST_META)
4445

4546
TPL-demodb.reflect.c:=metac_target

mk/bin.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# generates target to build binaries and .so
22
define bin_target_tpl
33

4-
# add extra LDFLAGS specific for this target
5-
$$(addprefix $1/,$2): LDFLAGS+=$$(LDFLAGS-$2)
4+
# add extra LDFLAGS specific for this target (don't add duplicates)
5+
$$(addprefix $1/,$2): LDFLAGS=$(filter-out $$(LDFLAGS-$2),$(LDFLAGS)) $$(LDFLAGS-$2)
66

77
ifneq ($$(CC-$2),)
88
$$(addprefix $1/,$2): CC=$$(CC-$2)

mk/test.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ IN-$(2:.checkmk=_checkmk.reflect.c)=$$(dir $(2:.c=))_meta_$$(notdir $(2:.checkmk
7878

7979
TPL-$$(dir $(2:.checkmk=_checkmk))_meta_$$(notdir $(2:.checkmk=_checkmk)):=bin_target
8080
IN-$$(dir $(2:.checkmk=_checkmk))_meta_$$(notdir $(2:.checkmk=_checkmk))=$(2:.checkmk=_checkmk.meta.o)
81-
LDFLAGS-$$(dir $(2:.checkmk=_checkmk))_meta_$$(notdir $(2:.checkmk=_checkmk))=$$(LDFLAGS-$(2:.checkmk=))
81+
LDFLAGS-$$(dir $(2:.checkmk=_checkmk))_meta_$$(notdir $(2:.checkmk=_checkmk))=$$(LDFLAGS-$(2:.checkmk=_checkmk))
8282
DEPS-$$(dir $(2:.checkmk=_checkmk))_meta_$$(notdir $(2:.checkmk=_checkmk))=$$(DEPS-$(2:.checkmk=))
8383
POST-$$(dir $(2:.checkmk=_checkmk))_meta_$$(notdir $(2:.checkmk=_checkmk))=$$(METAC_POST_META)
8484

0 commit comments

Comments
 (0)