Changeset 80649a91 in mainline for libc/Makefile

Timestamp:

2006-05-21T19:28:37Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

a410beb

Parents:

1ee11f4

Message:

Merged libadt into libc.
Made lot of psthread and thread stuff thread-safe.
Added new driver framework for easy C connection programming.
Changed FB code to use new API.

File:

• libc/Makefile (modified) (3 diffs)

libc/Makefile

@@ -63 +63 @@
         generic/psthread.c \
         generic/sysinfo.c \
-        generic/ipc.c
+        generic/ipc.c \
+        generic/async.c \
+        generic/libadt/list.o \
+        generic/libadt/hash_table.o
 
 ARCH_SOURCES += \
@@ -80 +83 @@
         ln -sfn kernel/arch include/arch
         ln -sfn ../arch/$(ARCH)/include include/libarch
-        ln -sfn ../../libadt/include include/libadt
 
 -include Makefile.depend
 
 clean:
-        -rm -f include/kernel include/arch include/libarch include/libadt libc.a arch/$(ARCH)/_link.ld Makefile.depend
+        -rm -f include/kernel include/arch include/libarch libc.a arch/$(ARCH)/_link.ld Makefile.depend
         find generic/ arch/$(ARCH)/ -name '*.o' -follow -exec rm \{\} \;
 
@@ -92 +94 @@
 
 libc.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
-        $(AR) rc libc.a $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
+        $(AR) rc libc.a $(LIBS) $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
 
 arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in