Changeset bc73be3 in mainline for uspace/app/hbench/Makefile

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:

• uspace/app/hbench/Makefile (moved) (moved from uspace/app/perf/Makefile ) (1 diff)

uspace/app/hbench/Makefile

@@ -31 +31 @@
 LIBS = math
 
-BINARY = perf
+BINARY = hbench
 
 SOURCES = \
-        perf.c \
+        benchlist.c \
+        csv.c \
+        env.c \
+        main.c \
+        utils.c \
+        fs/dirread.c \
+        fs/fileread.c \
         ipc/ns_ping.c \
         ipc/ping_pong.c \
         malloc/malloc1.c \
-        malloc/malloc2.c
+        malloc/malloc2.c \
+        synch/fibril_mutex.c
 
 include $(USPACE_PREFIX)/Makefile.common