Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
contiki-ng
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
NATAF Emmanuel
contiki-ng
Commits
162d1977
Unverified
Commit
162d1977
authored
3 years ago
by
Joakim Eriksson
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #1807 from pjonsson/add-q
cooja: add $(Q) to the customrules
parents
b11854a9
3efe81ef
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
arch/platform/cooja/Makefile.customrules-cooja
+7
-6
7 additions, 6 deletions
arch/platform/cooja/Makefile.customrules-cooja
with
7 additions
and
6 deletions
arch/platform/cooja/Makefile.customrules-cooja
+
7
−
6
View file @
162d1977
...
@@ -12,23 +12,24 @@ REDEF_PRINTF=1 # Redefine functions to enable printf()s inside Cooja
...
@@ -12,23 +12,24 @@ REDEF_PRINTF=1 # Redefine functions to enable printf()s inside Cooja
# NB: Assumes ARCHIVE was not overridden and is in $(BUILD_DIR_BOARD)
# NB: Assumes ARCHIVE was not overridden and is in $(BUILD_DIR_BOARD)
$(ARCHIVE)
:
$(CONTIKI_OBJECTFILES) | $(OBJECTDIR)
$(ARCHIVE)
:
$(CONTIKI_OBJECTFILES) | $(OBJECTDIR)
$(
AR_COMMAND_1
)
$^
$(
AR_COMMAND_2
)
$(
Q
)
$(
AR_COMMAND_1
)
$^
$(
AR_COMMAND_2
)
# NB: Assumes JNILIB was not overridden and is in $(BUILD_DIR_BOARD)
# NB: Assumes JNILIB was not overridden and is in $(BUILD_DIR_BOARD)
$(JNILIB)
:
$(CONTIKI_APP_OBJ) $(MAIN_OBJ) $(PROJECT_OBJECTFILES) $(ARCHIVE) | $(OBJECTDIR)
$(JNILIB)
:
$(CONTIKI_APP_OBJ) $(MAIN_OBJ) $(PROJECT_OBJECTFILES) $(ARCHIVE) | $(OBJECTDIR)
ifdef
REDEF_PRINTF
ifdef
REDEF_PRINTF
@echo
Redefining
printf,sprintf,vsnprintf,etc.
@echo
Redefining
printf,sprintf,vsnprintf,etc.
-
$(
foreach
OBJ,
$^
,
$(
OBJCOPY
)
--redefine-syms
$(
CONTIKI
)
/arch/platform/cooja/redefine.syms
$(
OBJ
);
)
-$(
Q)
$(
foreach
OBJ,
$^
,
$(
OBJCOPY
)
--redefine-syms
$(
CONTIKI
)
/arch/platform/cooja/redefine.syms
$(
OBJ
);
)
endif
## REDEF_PRINTF
endif
## REDEF_PRINTF
$(LINK_COMMAND_1)
$^
$(LINK_COMMAND_2)
@echo
Linking
$(JNILIB)
$(Q)$(LINK_COMMAND_1)
$^
$(LINK_COMMAND_2)
.PHONY
:
$(CONTIKI_APP).cooja
.PHONY
:
$(CONTIKI_APP).cooja
$(CONTIKI_APP).cooja
:
$(JNILIB)
$(CONTIKI_APP).cooja
:
$(JNILIB)
cp
$(
JNILIB
)
$@
$(
Q
)
cp
$(
JNILIB
)
$@
rm
$(
CONTIKI_APP_OBJ
)
$(
Q
)
rm
$(
CONTIKI_APP_OBJ
)
# Trickiness: GNU make matches this against the file base name.
# Trickiness: GNU make matches this against the file base name.
# Assume that the directory part is the standard location.
# Assume that the directory part is the standard location.
mtype%.o
:
platform.o | $(OBJECTDIR)
mtype%.o
:
platform.o | $(OBJECTDIR)
mv
platform.o
$@
$(
Q
)
mv
platform.o
$@
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment