Changeset 985e26d2 in mainline for uspace/lib/libblock

Timestamp:

2010-01-07T19:06:59Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8190e63

Parents:

743e17b (diff), eca2435 (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.

Location:

uspace/lib/libblock

Files:

• Makefile (modified) (1 diff)
• Makefile.build (added)
• Makefile.common (added)
• libblock.c (modified) (2 diffs)
• libblock.h (modified) (1 diff)

uspace/lib/libblock/Makefile

@@ -28 +28 @@
 #
 
-## Common compiler flags
-#
+include Makefile.common
 
-LIBC_PREFIX = ../libc
+.PHONY: all clean
 
-## Setup toolchain
-#
-
-include $(LIBC_PREFIX)/Makefile.toolchain
-
-CFLAGS += -Iinclude
-
-## Sources
-#
-
-SOURCES = \
-        libblock.c
-
-OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
-
-.PHONY: all clean depend
-
-all: libblock.a
-
--include Makefile.depend
+all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBC_PREFIX)/libc.a
+        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
+        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
 
 clean:
-        -rm -f libblock.a Makefile.depend
+        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(LIBBLOCK)
         find . -name '*.o' -follow -exec rm \{\} \;
-
-depend:
-        -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
-
-libblock.a: depend $(OBJECTS)
-        $(AR) rc libblock.a $(OBJECTS)
-
-%.o: %.c
-        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@

uspace/lib/libblock/libblock.c

@@ -47 +47 @@
 #include <as.h>
 #include <assert.h>
-#include <fibril_sync.h>
+#include <fibril_synch.h>
 #include <adt/list.h>
 #include <adt/hash_table.h>
@@ -168 +168 @@
         }
 
-        rc = ipc_share_out_start(dev_phone, comm_area,
+        rc = async_share_out_start(dev_phone, comm_area,
             AS_AREA_READ | AS_AREA_WRITE);
         if (rc != EOK) {

uspace/lib/libblock/libblock.h

@@ -36 +36 @@
 
 #ifndef LIBBLOCK_LIBBLOCK_H_
-#define LIBBLOCK_LIBBLOCK_H_ 
+#define LIBBLOCK_LIBBLOCK_H_
 
 #include <stdint.h>
 #include "../../srv/vfs/vfs.h"
-#include <fibril_sync.h>
+#include <fibril_synch.h>
 #include <adt/hash_table.h>
 #include <adt/list.h>