Changeset 77a194c in mainline for uspace/srv/bd/vbd/Makefile

Timestamp:

2015-11-04T18:55:46Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

44183b98

Parents:

5265eea4 (diff), bfcde8d (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 new disk partitioning architecture.

File:

• uspace/srv/bd/vbd/Makefile (moved) (moved from uspace/srv/bd/part/guid_part/Makefile ) (2 diffs)

uspace/srv/bd/vbd/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2010 Jiri Svoboda
+# Copyright (c) 2015 Jiri Svoboda
 # All rights reserved.
 #
@@ -27 +27 @@
 #
 
-USPACE_PREFIX = ../../../..
-LIBS = $(LIBBLOCK_PREFIX)/libblock.a
-EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
+USPACE_PREFIX = ../../..
 
-# Correct name is 'guid_part' but must use this because of FAT 8.3 names.
-BINARY = g_part
+LIBS = \
+        $(LIBLABEL_PREFIX)/liblabel.a \
+        $(LIBBLOCK_PREFIX)/libblock.a
+
+EXTRA_CFLAGS = \
+        -I$(LIBLABEL_PREFIX)/include \
+        -I$(LIBBLOCK_PREFIX)
+
+BINARY = vbd
 
 SOURCES = \
-        guid_part.c
+        disk.c \
+        vbd.c
 
 include $(USPACE_PREFIX)/Makefile.common