X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=klibc%2Fklibc%2FMakefile;h=0d5b197f0d8684b6cbe0f0faab0c2017f97ac0a9;hb=01504bd96b6e7cb6ad1350d6d0a0c6a1300409b8;hp=5fc481aa8a1554b59f520bcd9e0e5ef61aadc3e2;hpb=3555a14bae9f372385e4bc01368027cdbc29384c;p=elogind.git

diff --git a/klibc/klibc/Makefile b/klibc/klibc/Makefile
index 5fc481aa8..0d5b197f0 100644
--- a/klibc/klibc/Makefile
+++ b/klibc/klibc/Makefile
@@ -22,9 +22,9 @@ LIBOBJS = vsnprintf.o snprintf.o vsprintf.o sprintf.o \
 	  fopen.o fread.o fread2.o fgetc.o fgets.o \
 	  fwrite.o fwrite2.o fputc.o fputs.o puts.o \
 	  sleep.o usleep.o raise.o abort.o assert.o alarm.o pause.o \
-	  __signal.o signal.o bsd_signal.o siglist.o siglongjmp.o \
+	  __signal.o sysv_signal.o bsd_signal.o siglist.o siglongjmp.o \
 	  sigaction.o sigpending.o sigprocmask.o sigsuspend.o \
-	  brk.o sbrk.o malloc.o realloc.o calloc.o mmap.o \
+	  brk.o sbrk.o malloc.o realloc.o calloc.o mmap.o getpagesize.o \
 	  memcpy.o memcmp.o memset.o memccpy.o memmem.o memswap.o \
 	  memmove.o \
 	  strcasecmp.o strncasecmp.o strndup.o strerror.o \
@@ -33,7 +33,8 @@ LIBOBJS = vsnprintf.o snprintf.o vsprintf.o sprintf.o \
 	  strsep.o strtok.o \
 	  gethostname.o getdomainname.o getcwd.o \
 	  seteuid.o setegid.o setresuid.o setresgid.o \
-	  getenv.o setenv.o unsetenv.o getopt.o readdir.o \
+	  getenv.o setenv.o putenv.o __put_env.o unsetenv.o \
+	  getopt.o readdir.o \
 	  syslog.o closelog.o pty.o isatty.o reboot.o \
 	  time.o utime.o fdatasync.o llseek.o select.o nice.o getpriority.o \
 	  qsort.o lrand48.o srand48.o seed48.o \
@@ -118,12 +119,12 @@ socketcalls.dir: SOCKETCALLS socketcalls.pl socketcommon.h
 	touch $@
 
 %/static.obj: %.dir
-	$(MAKE) objects-$(basename $(notdir $@)) DIR=$*
+	$(MAKE) objects-$(basename $(notdir $@)) DIR=$*/
 
-STATIC = $(addsuffix .o,$(basename $(wildcard $(DIR)/*.[cS])))
+STATIC = $(addsuffix .o,$(basename $(wildcard $(DIR)*.[cS])))
 
 objects-static: $(STATIC)
-	touch $(DIR)/static.obj
+	touch $(DIR)static.obj
 
 clean: archclean
 	find . -type f -a \( -name \*.[isoa] -o -name \*.l[iso] \) -print0 | xargs -0rt rm -f
@@ -140,6 +141,6 @@ spotless: clean
 bitsize:
 	@echo $(BITSIZE)
 
-ifneq ($(wildcard $(DIR)/.*.d),)
-include $(wildcard $(DIR)/.*.d)
+ifneq ($(wildcard $(DIR).*.d),)
+include $(wildcard $(DIR).*.d)
 endif