sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move more files into subdirectories under lib/

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3442 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-03-30 21:58:17 +00:00
parent b76f19577d
commit 3325d73888
27 changed files with 162 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/Makefile
View File

@ -36,7 +36,10 @@
-include $(TOPDIR)/Make.defs
include stdio/Make.defs
include stdlib/Make.defs
include unistd/Make.defs
include string/Make.defs
include math/Make.defs
include net/Make.defs
include time/Make.defs
include queue/Make.defs
@ -48,19 +51,6 @@ ifneq ($(CONFIG_NFILE_STREAMS),0)
MISC_SRCS += lib_streamsem.c
endif
CTYPE_SRCS =
MATH_SRCS = lib_rint.c lib_fixedmath.c lib_b16sin.c lib_b16cos.c
UNISTD_SRCS = lib_getopt.c lib_getoptargp.c lib_getoptindp.c lib_getoptoptp.c
ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
ifneq ($(CONFIG_DISABLE_ENVIRON),y)
UNISTD_SRCS += lib_chdir.c lib_getcwd.c
endif
endif
NET_SRCS = lib_htons.c lib_htonl.c lib_inetntoa.c lib_etherntoa.c
LIBGEN_SRCS = lib_basename.c lib_dirname.c
REGEX_SRCS = lib_match.c
@ -69,8 +59,8 @@ CRC_SRCS = lib_crc32.c
DBG_SRCS = lib_dbg.c lib_dumpbuffer.c
CSRCS = $(MISC_SRCS) $(CTYPE_SRCS) $(STDIO_SRCS) $(STDLIB_SRCS) $(STRING_SRCS) \
$(TIME_SRCS) $(MATH_SRCS) $(UNISTD_SRCS) $(NET_SRCS) $(LIBGEN_SRCS) \
CSRCS = $(MISC_SRCS) $(CTYPE_SRCS) $(STDIO_SRCS) $(STDLIB_SRCS) $(UNISTD_SRCS) \
$(STRING_SRCS) $(MATH_SRCS) $(NET_SRCS) $(TIME_SRCS) $(LIBGEN_SRCS) \
$(REGEX_SRCS) $(CRC_SRCS) $(QUEUE_SRCS) $(DBG_SRCS)
COBJS = $(CSRCS:.c=$(OBJEXT))
@ -80,10 +70,13 @@ OBJS = $(AOBJS) $(COBJS)
ROOTDEPPATH = --dep-path .
STDIODEPPATH = --dep-path stdio
STDLIBDEPPATH = --dep-path stdlib
UNISTDDEPPATH = --dep-path unistd
STRINGDEPPATH = --dep-path string
MATHDEPPATH = --dep-path math
NETDEPPATH = --dep-path net
TIMEDEPPATH = --dep-path time
QUEUEDEPPATH = --dep-path queue
VPATH = stdio:stdlib:string:time:queue
VPATH = stdio:stdlib:unistd:string:math:net:time:queue
BIN = liblib$(LIBEXT)
@ -102,7 +95,8 @@ $(BIN): $(OBJS)
.depend: Makefile $(SRCS)
@$(MKDEP) $(ROOTDEPPATH) $(STDIODEPPATH) $(STDLIBDEPPATH) \
$(STRINGDEPPATH) $(TIMEDEPPATH) $(QUEUEDEPPATH) \
$(UNISTDDEPPATH) $(STRINGDEPPATH) $(MATHDEPPATH) $(NETDEPPATH) \
$(TIMEDEPPATH) $(QUEUEDEPPATH) \
$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@

2
lib/lib_basename.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* lib/lib_basename.c
* lib/unistd/lib_basename.c
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>

2
lib/lib_crc32.c
View File

@ -1,5 +1,5 @@
/************************************************************************************************
* lib/lib_crc32.c
* lib/unistd/lib_crc32.c
*
* This file is a part of NuttX:
*

2
lib/lib_dbg.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* lib/lib_dbg.c
* lib/unistd/lib_dbg.c
*
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>

2
lib/lib_dirname.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* lib/lib_dirname.c
* lib/unistd/lib_dirname.c
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>

2
lib/lib_dumpbuffer.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* lib/lib_dumpbuffer.c
* lib/unistd/lib_dumpbuffer.c
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>

2
lib/lib_filesem.c
View File

@ -1,5 +1,5 @@
/************************************************************************
* lib/lib_filesem.c
* lib/unistd/lib_filesem.c
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>

2
lib/lib_libdtoa.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* lib/lib_libdtoa.c
* lib/unistd/lib_libdtoa.c
*
* This file was ported to NuttX by Yolande Cates.
*

2
lib/lib_sem.c
View File

@ -1,5 +1,5 @@
/************************************************************
* lib/lib_sem.c
* lib/unistd/lib_sem.c
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>

2
lib/lib_streamsem.c
View File

@ -1,5 +1,5 @@
/************************************************************************
* lib/ib_streamsem.c
* lib/unistd/lib_streamsem.c
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>

37
lib/math/Make.defs Normal file
View File

@ -0,0 +1,37 @@
############################################################################
# lib/math/Make.defs
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the
# distribution.
# 3. Neither the name NuttX nor the names of its contributors may be
# used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
MATH_SRCS = lib_rint.c lib_fixedmath.c lib_b16sin.c lib_b16cos.c

4
lib/lib_b16cos.c → lib/math/lib_b16cos.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* lib/lib_b16cos.c
* lib/math/lib_b16cos.c
*
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without

4
lib/lib_b16sin.c → lib/math/lib_b16sin.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* lib/lib_b16sin.c
* lib/math/lib_b16sin.c
*
* Copyright (C) 2008 Gregory Nutt. All rights reserved.
* Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without

4
lib/lib_fixedmath.c → lib/math/lib_fixedmath.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* lib/lib_fixedmath.c
* lib/math/lib_fixedmath.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without

4
lib/lib_rint.c → lib/math/lib_rint.c
View File

@ -1,7 +1,7 @@
/************************************************************
* lib_rint.c
* lib/math/lib_rint.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without

36
lib/net/Make.defs Normal file
View File

@ -0,0 +1,36 @@
############################################################################
# lib/net/Make.defs
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the
# distribution.
# 3. Neither the name NuttX nor the names of its contributors may be
# used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
NET_SRCS = lib_htons.c lib_htonl.c lib_inetntoa.c lib_etherntoa.c

4
lib/lib_etherntoa.c → lib/net/lib_etherntoa.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* lib/lib_etherntoa.c
* lib/net/lib_etherntoa.c
*
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without

4
lib/lib_htonl.c → lib/net/lib_htonl.c
View File

@ -1,7 +1,7 @@
/************************************************************
* lib/lib_ntohl.c
* lib/net/lib_ntohl.c
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without

4
lib/lib_htons.c → lib/net/lib_htons.c
View File

@ -1,7 +1,7 @@
/***************************************************************************
* lib/lib_htons.c
* lib/net/lib_htons.c
*
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without

4
lib/lib_inetntoa.c → lib/net/lib_inetntoa.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* lib/lib_inetntoa.c
* lib/net/lib_inetntoa.c
*
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without

42
lib/unistd/Make.defs Normal file
View File

@ -0,0 +1,42 @@
############################################################################
# lib/unistd/Make.defs
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the
# distribution.
# 3. Neither the name NuttX nor the names of its contributors may be
# used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
UNISTD_SRCS = lib_getopt.c lib_getoptargp.c lib_getoptindp.c lib_getoptoptp.c
ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
ifneq ($(CONFIG_DISABLE_ENVIRON),y)
UNISTD_SRCS += lib_chdir.c lib_getcwd.c
endif
endif

4
lib/lib_chdir.c → lib/unistd/lib_chdir.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* lib/lib_chdir.c
* lib/unistd/lib_chdir.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without

4
lib/lib_getcwd.c → lib/unistd/lib_getcwd.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* lib/lib_getcwd.c
* lib/unistd/lib_getcwd.c
*
* Copyright (C) 2008 Gregory Nutt. All rights reserved.
* Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without

2
lib/lib_getopt.c → lib/unistd/lib_getopt.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* lib/lib_getopt.c
* lib/unistd/lib_getopt.c
*
* Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>

4
lib/lib_getoptargp.c → lib/unistd/lib_getoptargp.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* lib/lib_getoptargp.c
* lib/unistd/lib_getoptargp.c
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without

4
lib/lib_getoptindp.c → lib/unistd/lib_getoptindp.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* lib/lib_getoptindp.c
* lib/unistd/lib_getoptindp.c
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without

4
lib/lib_getoptoptp.c → lib/unistd/lib_getoptoptp.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* lib/lib_getoptoptp.c
* lib/unistd/lib_getoptoptp.c
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without