Changeset ab936440 in mainline for kernel/Makefile

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

• kernel/Makefile (modified) (3 diffs)

kernel/Makefile

@@ -162 +162 @@
 GENERIC_SOURCES = \
         generic/src/adt/bitmap.c \
-        generic/src/adt/btree.c \
         generic/src/adt/hash_table.c \
         generic/src/adt/list.c \
@@ -279 +278 @@
                 test/test.c \
                 test/atomic/atomic1.c \
-                test/btree/btree1.c \
                 test/fault/fault1.c \
                 test/mm/falloc1.c \
@@ -314 +312 @@
 ifeq ($(CONFIG_TRACE),y)
         INSTRUMENTED_SOURCES = \
-                generic/src/adt/btree.c \
                 generic/src/cpu/cpu.c \
                 generic/src/ddi/ddi.c \