Changeset 445 for trunk/libs/libpthread/Makefile

Timestamp:

May 29, 2018, 9:27:23 AM (7 years ago)

Author:

alain

Message:

Restructure the mini_libc.

Location:

trunk/libs/libpthread

Files:

• . (moved) (moved from trunk/libs/mini-libpthread)
• Makefile (modified) (4 diffs)

trunk/libs/libpthread/Makefile

@@ -1 +1 @@
 ############################################################################
-#                    Makefile for the ALMOS-MKH "mini-pthread"             #
+#               Makefile for the "pthread" library.                        #
 ############################################################################
 
 -include ../../params-soft.mk
+
 ifeq ($(ARCH_NAME),)
 $(error Please define in ARCH_NAME parameter in params-soft.mk!)
@@ -9 +10 @@
 
 SRCS = pthread.c
-OBJS = $(addprefix build/, $(SRCS:.c=.o))
-#       $(HAL_ARCH)/build/core/hal_user.o
 
-INCLUDES = -I. -I$(HAL)/generic -I$(LIBC_INCLUDE) -I$(LIBALMOSMKH_INCLUDE) -I$(SHARED_INCLUDE)
+OBJS = $(addprefix build/, $(SRCS:.c=.o)) \
+       $(HAL_ARCH)/build/core/hal_user.o
 
-libs : build/lib/libpthread.a headers
+INCLUDES = -I.                     \
+           -I$(LIBC_PATH)          \
+           -I$(LIBALMOSMKH_PATH)   \
+           -I$(SHARED_INCLUDE)     \
+           -I$(HAL)/generic        \
+           -I$(HAL_ARCH)/core      \
+           -I$(KERNEL) 
+
+libs : build/lib/libpthread.a  headers
 
 build :
@@ -24 +32 @@
         $(MAKE) -C $(HAL_ARCH)
 
-../mini-libc/build/%.o:
-        $(MAKE) -C ../libc -f Makefile.tsar
-
 build/%.o : %.c %.h
         $(CC) $(INCLUDES) $(CFLAGS) -c -o  $@ $<
@@ -32 +37 @@
 
 headers: build
-        cp $(SRCS:.c=.h) build/include/.
+        cp $(SRCS:.c=.h)  build/include/.
 
 
-build/lib/libpthread.a: build $(OBJS)
-        $(AR) rc $@ $(OBJS) #$(OBJS_LIBC)
+build/lib/libpthread.a: build  $(OBJS)
+        $(AR) rc $@ $(OBJS) 
         $(RANLIB) $@