sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libminc-related updates

Browse source 
- add files needed for acpi, ahci, fbd, vfs to libminc
- remove "-lc" from their respective makefiles
- remove setenv from libminc (requires initialization)
This commit is contained in:
David van Moolenbroek 2012-03-09 00:49:46 +01:00
parent 0438b62014
commit e8d2d2f6b6
5 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/acpi/Makefile
View file

@ -134,7 +134,7 @@ ACPICA_SRCS= \
SRCS+=${ACPICA_SRCS}
DPADD+= ${LIBSYS}
LDADD+= -lsys -lc
LDADD+= -lsys
CPPFLAGS += -I${.CURDIR}/include
CFLAGS += -DACPI_LIBRARY

2
drivers/ahci/Makefile
View file

@ -5,8 +5,6 @@ SRCS= ahci.c
DPADD+= ${LIBBLOCKDRIVER} ${LIBSYS} ${LIBTIMERS} ${LIBMTHREAD}
LDADD+= -lblockdriver -lsys -ltimers -lmthread
LDADD+= -lc
MAN=
BINDIR?= /sbin

2
drivers/fbd/Makefile
View file

@ -6,7 +6,7 @@ PROG= fbd
SRCS= fbd.c rule.c action.c
DPADD+= ${LIBBLOCKDRIVER} ${LIBSYS}
LDADD+= -lblockdriver -lsys -lc
LDADD+= -lblockdriver -lsys
CPPFLAGS+= -DDEBUG=0
# The FBD driver requires NetBSD libc.

15
lib/libminc/Makefile
View file

@ -59,14 +59,15 @@ CPPFLAGS.fputs.c+= -I${LIBCSRCDIR}/include
#
# Import from stdio
.for i in sprintf.c fprintf.c perror.c vsnprintf.c snprintf.c
.for i in sprintf.c fprintf.c perror.c vsnprintf.c snprintf.c \
_rand48.c lrand48.c srand48.c
.PATH.c: ${LIBCSRCDIR}/stdio
CPPFLAGS.${i}= -I${LIBCSRCDIR}/stdio -I${LIBCSRCDIR}/include
SRCS+= ${i}
.endfor
# Import from stdlib
.for i in abort.c atexit.c atoi.c exit.c getenv.c \
getopt.c ldiv.c setenv.c
getopt.c ldiv.c
.PATH.c: ${LIBCSRCDIR}/stdlib
SRCS+= ${i}
CPPFLAGS.${i}+= -I${LIBCSRCDIR}/stdlib -I${LIBCSRCDIR}/include
@ -79,7 +80,7 @@ errlist.c: ${LIBCSRCDIR}/gen/errlist.awk \
.for i in assert.c _errno.c errno.c _env.c errlist.c \
execle.c getprogname.c sleep.c time.c \
ctype_.c isctype.c tolower_.c toupper_.c \
ctype_.c isctype.c tolower_.c toupper_.c usleep.c \
infinityf_ieee754.c infinity_ieee754.c \
fpclassifyf_ieee754.c fpclassifyd_ieee754.c \
isinff_ieee754.c isinfd_ieee754.c \
@ -126,10 +127,10 @@ CPPFLAGS.${i}+= -I${LIBCSRCDIR}/include -I${LIBCSRCDIR}/locale
# Import from sys-minix
.for i in access.c brk.c close.c environ.c execve.c fork.c \
getgid.c getpid.c getuid.c gettimeofday.c loadname.c \
link.c mknod.c mmap.c nanosleep.c open.c read.c sbrk.c \
select.c setuid.c stat.c stime.c syscall.c umask.c \
unlink.c waitpid.c \
brksize.S _ipc.S _senda.S
link.c _mcontext.c mknod.c mmap.c nanosleep.c open.c \
read.c sbrk.c select.c setuid.c sigprocmask.c stat.c \
stime.c syscall.c _ucontext.c umask.c unlink.c waitpid.c \
brksize.S _ipc.S _senda.S ucontext.S
.PATH.c: ${LIBCSRCDIR}/sys-minix
.PATH.S: ${LIBCSRCDIR}/arch/${MACHINE}/sys-minix
SRCS+= ${i}

2
servers/vfs/Makefile
View file

@ -17,8 +17,6 @@ CPPFLAGS+= -DUSE_COVERAGE
DPADD+= ${LIBSYS} ${LIBTIMERS} ${LIBEXEC}
LDADD+= -lsys -ltimers -lexec -lmthread
LDADD+= -lc
MAN=
BINDIR?= /usr/sbin