Changeset 95c675b in mainline for uspace/lib/c/Makefile

Timestamp:

2017-10-17T13:11:35Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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.

Message:

Merge mainline

File:

• uspace/lib/c/Makefile (modified) (6 diffs)

uspace/lib/c/Makefile

@@ -63 +63 @@
         generic/bd.c \
         generic/bd_srv.c \
+        generic/perm.c \
         generic/cap.c \
         generic/clipboard.c \
@@ -81 +82 @@
         generic/event.c \
         generic/errno.c \
+        generic/gsort.c \
         generic/loc.c \
         generic/mem.c \
@@ -124 +126 @@
         generic/io/con_srv.c \
         generic/io/console.c \
+        generic/io/table.c \
         generic/io/visualizer.c \
         generic/io/window.c \
@@ -158 +161 @@
         generic/stacktrace.c \
         generic/arg_parse.c \
-        generic/sort.c \
         generic/stats.c \
         generic/assert.c \
         generic/pio_trace.c \
+        generic/qsort.c \
         generic/uuid.c \
         generic/vbd.c \
@@ -179 +182 @@
 
 TEST_SOURCES = \
+        test/fibril/timer.c \
         test/main.c \
+        test/io/table.c \
         test/odict.c \
+        test/qsort.c \
         test/sprintf.c \
         test/str.c
@@ -188 +194 @@
 %.h: %.ag
         $(AUTOGEN) probe $< >$<.probe.c
-        $(CC) $(DEFS) $(CFLAGS) -S -o $<.probe.s $<.probe.c
+        $(CC_AUTOGEN) $(DEFS) $(CFLAGS) -S -o $<.probe.s $<.probe.c
         $(AUTOGEN) generate $< <$<.probe.s >$@