Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RIOT
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
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
cm-projects
RIOT
Commits
956f0e86
Commit
956f0e86
authored
11 years ago
by
Oleg Hahm
Browse files
Options
Downloads
Patches
Plain Diff
fix for #87, replacing - with _ in module protocol_multiplex
parent
836ae0d2
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile.dep
+2
-2
2 additions, 2 deletions
Makefile.dep
sys/Makefile
+1
-1
1 addition, 1 deletion
sys/Makefile
sys/net/protocol-multiplex/Makefile
+1
-1
1 addition, 1 deletion
sys/net/protocol-multiplex/Makefile
with
4 additions
and
4 deletions
Makefile.dep
+
2
−
2
View file @
956f0e86
...
@@ -14,8 +14,8 @@ ifneq (,$(findstring uart0,$(USEMODULE)))
...
@@ -14,8 +14,8 @@ ifneq (,$(findstring uart0,$(USEMODULE)))
endif
endif
ifneq
(,$(findstring cc110x,$(USEMODULE)))
ifneq
(,$(findstring cc110x,$(USEMODULE)))
ifeq
(,$(findstring protocol
-
multiplex,$(USEMODULE)))
ifeq
(,$(findstring protocol
_
multiplex,$(USEMODULE)))
USEMODULE
+=
protocol
-
multiplex
USEMODULE
+=
protocol
_
multiplex
endif
endif
endif
endif
...
...
This diff is collapsed.
Click to expand it.
sys/Makefile
+
1
−
1
View file @
956f0e86
...
@@ -70,7 +70,7 @@ endif
...
@@ -70,7 +70,7 @@ endif
ifneq
(,$(findstring net_help,$(USEMODULE)))
ifneq
(,$(findstring net_help,$(USEMODULE)))
DIRS
+=
net/net_help
DIRS
+=
net/net_help
endif
endif
ifneq
(,$(findstring protocol
-
multiplex,$(USEMODULE)))
ifneq
(,$(findstring protocol
_
multiplex,$(USEMODULE)))
DIRS
+=
net/protocol-multiplex
DIRS
+=
net/protocol-multiplex
endif
endif
ifneq
(,$(findstring sixlowpan,$(USEMODULE)))
ifneq
(,$(findstring sixlowpan,$(USEMODULE)))
...
...
This diff is collapsed.
Click to expand it.
sys/net/protocol-multiplex/Makefile
+
1
−
1
View file @
956f0e86
MODULE
:=
$(
shell
basename
$(
CURDIR
))
MODULE
:=
protocol_multiplex
INCLUDES
=
-I
$(
RIOTBASE
)
-I
$(
RIOTBASE
)
/sys/include
-I
$(
RIOTBASE
)
/core/include
INCLUDES
=
-I
$(
RIOTBASE
)
-I
$(
RIOTBASE
)
/sys/include
-I
$(
RIOTBASE
)
/core/include
include
$(RIOTBASE)/Makefile.base
include
$(RIOTBASE)/Makefile.base
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