Skip to content

Support for TGT_LDLIBDIRS #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dolanor wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support for TGT_LDLIBDIRS #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ define ADD_TARGET_RULE

$${TARGET_DIR}/${1}: $${${1}_OBJS} $${${1}_PREREQS}
@mkdir -p $$(dir $$@)
$$(strip $${${1}_LINKER} -o $$@ $${LDFLAGS} $${${1}_LDFLAGS} \
$$(strip $${${1}_LINKER} -o $$@ $${LDFLAGS} $${${1}_LDFLAGS} $${LDLIBDIRS} $${${1}_LDLIBDIRS} \
$${${1}_OBJS} $${LDLIBS} $${${1}_LDLIBS})
$${${1}_POSTMAKE}
endif
Expand Down Expand Up @@ -145,6 +145,7 @@ define INCLUDE_SUBMAKEFILE
TGT_INCDIRS :=
TGT_LDFLAGS :=
TGT_LDLIBS :=
TGT_LDLIBDIRS :=
TGT_LINKER :=
TGT_POSTCLEAN :=
TGT_POSTMAKE :=
Expand Down Expand Up @@ -185,6 +186,8 @@ define INCLUDE_SUBMAKEFILE
# makefile apply to this new target. Initialize the target's variables.
TGT := $$(strip $${TARGET})
ALL_TGTS += $${TGT}
$${TGT}_LDLIBDIRS := $$(call QUALIFY_PATH,$${DIR},$${TGT_LDLIBDIRS})
$${TGT}_LDLIBDIRS := $$(call CANONICAL_PATH,$${$${TGT}_LDLIBDIRS})
$${TGT}_CFLAGS := $${TGT_CFLAGS}
$${TGT}_CXXFLAGS := $${TGT_CXXFLAGS}
$${TGT}_DEFS := $${TGT_DEFS}
Expand All @@ -198,10 +201,14 @@ define INCLUDE_SUBMAKEFILE
$${TGT}_POSTMAKE := $${TGT_POSTMAKE}
$${TGT}_PREREQS := $$(addprefix $${TARGET_DIR}/,$${TGT_PREREQS})
$${TGT}_SOURCES :=
$${TGT}_LDLIBDIRS := $$(addprefix -L,\
$${$${TGT}_LDLIBDIRS})
else
# The values defined by this makefile apply to the the "current" target
# as determined by which target is at the top of the stack.
TGT := $$(strip $$(call PEEK,$${TGT_STACK}))
$${TGT}_LDLIBDIRS := $$(call QUALIFY_PATH,$${DIR},$${TGT_LDLIBDIRS})
$${TGT}_LDLIBDIRS := $$(call CANONICAL_PATH,$${{$$TGT}_LDLIBDIRS})
$${TGT}_CFLAGS += $${TGT_CFLAGS}
$${TGT}_CXXFLAGS += $${TGT_CXXFLAGS}
$${TGT}_DEFS += $${TGT_DEFS}
Expand All @@ -211,6 +218,8 @@ define INCLUDE_SUBMAKEFILE
$${TGT}_POSTCLEAN += $${TGT_POSTCLEAN}
$${TGT}_POSTMAKE += $${TGT_POSTMAKE}
$${TGT}_PREREQS += $${TGT_PREREQS}
$${TGT}_LDLIBDIRS := $$(addprefix -L,\
$${$${TGT}_LDLIBDIRS})
endif

# Push the current target onto the target stack.
Expand Down Expand Up @@ -330,6 +339,7 @@ ALL_TGTS :=
DEFS :=
DIR_STACK :=
INCDIRS :=
LDLIBDIRS :=
TGT_STACK :=

# Include the main user-supplied submakefile. This also recursively includes
Expand All @@ -339,6 +349,7 @@ $(eval $(call INCLUDE_SUBMAKEFILE,main.mk))
# Perform post-processing on global variables as needed.
DEFS := $(addprefix -D,${DEFS})
INCDIRS := $(addprefix -I,$(call CANONICAL_PATH,${INCDIRS}))
LDLIBDIRS := $(addprefix -L,$(call CANONICAL_PATH,${LDLIBDIRS}))

# Define the "all" target (which simply builds all user-defined targets) as the
# default goal.
Expand Down