Changeset b0f00a9 in mainline for uspace/app/mkmfs/Makefile

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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 changes.

File:

• uspace/app/mkmfs/Makefile (moved) (moved from uspace/srv/hid/char_mouse/Makefile ) (1 diff)

uspace/app/mkmfs/Makefile

@@ -28 +28 @@
 #
 
-USPACE_PREFIX = ../../..
-EXTRA_CFLAGS = -Iinclude
-BINARY = char_ms
+USPACE_PREFIX = ../..
+LIBS = $(LIBBLOCK_PREFIX)/libblock.a
+EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBMINIX_PREFIX)
+BINARY = mkmfs
 
 SOURCES = \
-        proto/ps2.c \
-        char_mouse.c \
-        chardev.c
+        mkmfs.c
 
 include $(USPACE_PREFIX)/Makefile.common