Changeset a3da2b2 in mainline


Ignore:
Timestamp:
2012-08-31T09:55:22Z (12 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ca4c6ec1
Parents:
33fee91
Message:

Introduce include/ and source/ directories into libposix

Location:
uspace
Files:
2 edited
48 moved

Legend:

Unmodified
Added
Removed

  • uspace/Makefile.common

    r33fee91 ra3da2b2  
    225225
    226226ifeq ($(POSIX_COMPAT),y)
    227         CFLAGS = -I$(LIBPOSIX_PREFIX)
     227        CFLAGS = -I$(LIBPOSIX_PREFIX)/include/posix  -I$(LIBPOSIX_PREFIX)/include/
    228228        LIBS += $(LIBPOSIX_PREFIX)/libposix.a
    229229endif

  • uspace/lib/posix/Makefile

    r33fee91 ra3da2b2  
    3333LSONAME = libposix.so0
    3434
    35 INCLUDE_LIBC = ./libc
     35EXTRA_CFLAGS = -Iinclude/
     36
     37INCLUDE_LIBC = ./include/libc
    3638
    3739PRE_DEPEND = $(INCLUDE_LIBC)
    … …  
    3941
    4042SOURCES = \
    41         ctype.c \
    42         errno.c \
    43         fcntl.c \
    44         fnmatch.c \
    45         getopt.c \
    46         locale.c \
    47         math.c \
    48         pwd.c \
    49         signal.c \
    50         stdio.c \
    51         stdio/scanf.c \
    52         stdlib.c \
    53         stdlib/strtol.c \
    54         stdlib/strtold.c \
    55         string.c \
    56         strings.c \
    57         sys/stat.c \
    58         sys/wait.c \
    59         time.c \
    60         unistd.c
     43        source/ctype.c \
     44        source/errno.c \
     45        source/fcntl.c \
     46        source/fnmatch.c \
     47        source/getopt.c \
     48        source/locale.c \
     49        source/math.c \
     50        source/pwd.c \
     51        source/signal.c \
     52        source/stdio.c \
     53        source/stdio/scanf.c \
     54        source/stdlib.c \
     55        source/stdlib/strtol.c \
     56        source/stdlib/strtold.c \
     57        source/string.c \
     58        source/strings.c \
     59        source/sys/stat.c \
     60        source/sys/wait.c \
     61        source/time.c \
     62        source/unistd.c
    6163
    6264include $(USPACE_PREFIX)/Makefile.common
    6365
    6466$(INCLUDE_LIBC): ../c/include
    65         ln -s -f -n $^ $@
     67        ln -s -f -n ../$^ $@

  • uspace/lib/posix/include/posix/sys/mman.h

    r33fee91 ra3da2b2  
    3636#define POSIX_SYS_MMAN_H_
    3737
    38 #include "../libc/sys/mman.h"
     38#include "libc/sys/mman.h"
    3939
    4040#undef PROT_NONE

  • uspace/lib/posix/include/posix/sys/stat.h

    r33fee91 ra3da2b2  
    3737#define POSIX_SYS_STAT_H_
    3838
    39 #include "../libc/sys/stat.h"
     39#include "libc/sys/stat.h"
    4040#include "types.h"
    4141#include "../time.h"

  • uspace/lib/posix/include/posix/sys/types.h

    r33fee91 ra3da2b2  
    3737#define POSIX_SYS_TYPES_H_
    3838
    39 #include "../libc/sys/types.h"
     39#include "libc/sys/types.h"
    4040
    4141typedef unsigned int posix_ino_t;

  • uspace/lib/posix/source/ctype.c

    r33fee91 ra3da2b2  
    3636#define LIBPOSIX_INTERNAL
    3737
    38 #include "ctype.h"
     38#include "posix/ctype.h"
    3939
    4040/**

  • uspace/lib/posix/source/errno.c

    r33fee91 ra3da2b2  
    3333 */
    3434
    35 #include "errno.h"
     35#include "posix/errno.h"
    3636
    37 #include "stdlib.h"
     37#include "posix/stdlib.h"
    3838#include "libc/fibril.h"
    3939

  • uspace/lib/posix/source/fcntl.c

    r33fee91 ra3da2b2  
    3636
    3737#include "internal/common.h"
    38 #include "fcntl.h"
     38#include "posix/fcntl.h"
    3939
    4040#include "libc/unistd.h"
    4141#include "libc/vfs/vfs.h"
    42 #include "errno.h"
     42#include "posix/errno.h"
    4343
    4444/**

  • uspace/lib/posix/source/fnmatch.c

    r33fee91 ra3da2b2  
    4242 */
    4343
    44 #include "stdbool.h"
    45 #include "ctype.h"
    46 #include "string.h"
    47 #include "stdlib.h"
    48 #include "assert.h"
     44#include "posix/stdbool.h"
     45#include "posix/ctype.h"
     46#include "posix/string.h"
     47#include "posix/stdlib.h"
     48#include "posix/assert.h"
    4949
    5050#define LIBPOSIX_INTERNAL
    5151
    5252#include "internal/common.h"
    53 #include "fnmatch.h"
     53#include "posix/fnmatch.h"
    5454
    5555/* Returned by _match... functions. */

  • uspace/lib/posix/source/getopt.c

    r33fee91 ra3da2b2  
    3636#include "internal/common.h"
    3737#include "libc/getopt.h"
    38 #include "getopt.h"
     38#include "posix/getopt.h"
    3939
    4040

  • uspace/lib/posix/source/locale.c

    r33fee91 ra3da2b2  
    3636
    3737#include "internal/common.h"
    38 #include "locale.h"
     38#include "posix/locale.h"
    3939
    40 #include "errno.h"
    41 #include "limits.h"
    42 #include "string.h"
     40#include "posix/errno.h"
     41#include "posix/limits.h"
     42#include "posix/string.h"
    4343
    4444/* Just a very basic dummy implementation.

  • uspace/lib/posix/source/math.c

    r33fee91 ra3da2b2  
    3636
    3737#include "internal/common.h"
    38 #include "math.h"
     38#include "posix/math.h"
    3939
    4040/**

  • uspace/lib/posix/source/pwd.c

    r33fee91 ra3da2b2  
    3535#define LIBPOSIX_INTERNAL
    3636
    37 #include "pwd.h"
    38 #include "string.h"
    39 #include "errno.h"
    40 #include "assert.h"
     37#include "posix/pwd.h"
     38#include "posix/string.h"
     39#include "posix/errno.h"
     40#include "posix/assert.h"
    4141
    4242static bool entry_read = false;

  • uspace/lib/posix/source/signal.c

    r33fee91 ra3da2b2  
    3535#define LIBPOSIX_INTERNAL
    3636
    37 #include "signal.h"
     37#include "posix/signal.h"
    3838#include "internal/common.h"
    39 #include "limits.h"
    40 #include "stdlib.h"
    41 #include "string.h"
    42 #include "errno.h"
     39#include "posix/limits.h"
     40#include "posix/stdlib.h"
     41#include "posix/string.h"
     42#include "posix/errno.h"
    4343
    4444#include "libc/fibril_synch.h"

  • uspace/lib/posix/source/stdio.c

    r33fee91 ra3da2b2  
    3737
    3838/* Has to be first. */
    39 #include "stdbool.h"
     39#include "posix/stdbool.h"
    4040
    4141#include "internal/common.h"
    42 #include "stdio.h"
    43 
    44 #include "assert.h"
    45 #include "errno.h"
    46 #include "stdlib.h"
    47 #include "string.h"
    48 #include "sys/types.h"
    49 #include "unistd.h"
     42#include "posix/stdio.h"
     43
     44#include "posix/assert.h"
     45#include "posix/errno.h"
     46#include "posix/stdlib.h"
     47#include "posix/string.h"
     48#include "posix/sys/types.h"
     49#include "posix/unistd.h"
    5050
    5151#include "libc/io/printf_core.h"
    … …  
    5959 * need to be implemented in libc anyway
    6060 */
    61 #include "../c/generic/private/stdio.h"
     61#include "../../c/generic/private/stdio.h"
    6262
    6363/** Clears the stream's error and end-of-file indicators.

  • uspace/lib/posix/source/stdio/scanf.c

    r33fee91 ra3da2b2  
    3636
    3737/* Must be first. */
    38 #include "../stdbool.h"
    39 
    40 #include "../assert.h"
    41 #include "../errno.h"
    42 
    43 #include "../stdio.h"
    44 #include "../stdlib.h"
    45 #include "../stddef.h"
    46 #include "../string.h"
    47 #include "../ctype.h"
    48 #include "../sys/types.h"
     38#include "posix/stdbool.h"
     39
     40#include "posix/assert.h"
     41#include "posix/errno.h"
     42
     43#include "posix/stdio.h"
     44#include "posix/stdlib.h"
     45#include "posix/stddef.h"
     46#include "posix/string.h"
     47#include "posix/ctype.h"
     48#include "posix/sys/types.h"
    4949
    5050#include "../internal/common.h"
    51 #include "../libc/malloc.h"
     51#include "libc/malloc.h"
    5252
    5353/** Unified data type for possible data sources for scanf. */

  • uspace/lib/posix/source/stdlib.c

    r33fee91 ra3da2b2  
    3737
    3838#include "internal/common.h"
    39 #include "stdlib.h"
    40 
    41 #include "errno.h"
    42 #include "fcntl.h"
    43 #include "limits.h"
    44 #include "string.h"
    45 #include "sys/stat.h"
    46 #include "unistd.h"
     39#include "posix/stdlib.h"
     40
     41#include "posix/errno.h"
     42#include "posix/fcntl.h"
     43#include "posix/limits.h"
     44#include "posix/string.h"
     45#include "posix/sys/stat.h"
     46#include "posix/unistd.h"
    4747
    4848#include "libc/sort.h"

  • uspace/lib/posix/source/stdlib/strtol.c

    r33fee91 ra3da2b2  
    3636
    3737#include "../internal/common.h"
    38 #include "../stdlib.h"
    39 
    40 #include "../ctype.h"
    41 #include "../errno.h"
    42 #include "../inttypes.h"
    43 #include "../limits.h"
     38#include "posix/stdlib.h"
     39
     40#include "posix/ctype.h"
     41#include "posix/errno.h"
     42#include "posix/inttypes.h"
     43#include "posix/limits.h"
    4444
    4545#define intmax_t posix_intmax_t

  • uspace/lib/posix/source/stdlib/strtold.c

    r33fee91 ra3da2b2  
    3636
    3737/* Must be first. */
    38 #include "../stdbool.h"
     38#include "posix/stdbool.h"
    3939
    4040#include "../internal/common.h"
    41 #include "../stdlib.h"
    42 
    43 #include "../assert.h"
    44 #include "../ctype.h"
    45 #include "../stdint.h"
    46 #include "../strings.h"
    47 #include "../errno.h"
    48 #include "../limits.h"
    49 
    50 #include "../float.h"
     41#include "posix/stdlib.h"
     42
     43#include "posix/assert.h"
     44#include "posix/ctype.h"
     45#include "posix/stdint.h"
     46#include "posix/strings.h"
     47#include "posix/errno.h"
     48#include "posix/limits.h"
     49
     50#include "posix/float.h"
    5151
    5252#ifndef HUGE_VALL

  • uspace/lib/posix/source/string.c

    r33fee91 ra3da2b2  
    3737
    3838#include "internal/common.h"
    39 #include "string.h"
    40 
    41 #include "assert.h"
    42 #include "errno.h"
    43 #include "limits.h"
    44 #include "stdlib.h"
    45 #include "signal.h"
     39#include "posix/string.h"
     40
     41#include "posix/assert.h"
     42#include "posix/errno.h"
     43#include "posix/limits.h"
     44#include "posix/stdlib.h"
     45#include "posix/signal.h"
    4646
    4747#include "libc/str_error.h"

  • uspace/lib/posix/source/strings.c

    r33fee91 ra3da2b2  
    3737
    3838#include "internal/common.h"
    39 #include "strings.h"
     39#include "posix/strings.h"
    4040
    41 #include "string.h"
    42 #include "ctype.h"
     41#include "posix/string.h"
     42#include "posix/ctype.h"
    4343
    4444#include "libc/mem.h"

  • uspace/lib/posix/source/sys/stat.c

    r33fee91 ra3da2b2  
    3737
    3838#include "../internal/common.h"
    39 #include "stat.h"
     39#include "posix/sys/stat.h"
    4040
    41 #include "../errno.h"
    42 #include "../libc/mem.h"
     41#include "posix/errno.h"
     42#include "libc/mem.h"
    4343
    4444/**

  • uspace/lib/posix/source/sys/wait.c

    r33fee91 ra3da2b2  
    3737
    3838#include "../internal/common.h"
    39 #include "wait.h"
     39#include "posix/sys/wait.h"
    4040
    41 #include "../libc/task.h"
    42 #include "../assert.h"
    43 #include "../errno.h"
    44 #include "../limits.h"
    45 #include "../signal.h"
     41#include "libc/task.h"
     42#include "posix/assert.h"
     43#include "posix/errno.h"
     44#include "posix/limits.h"
     45#include "posix/signal.h"
    4646
    4747int __posix_wifexited(int status) {

  • uspace/lib/posix/source/time.c

    r33fee91 ra3da2b2  
    3737
    3838/* Must be first. */
    39 #include "stdbool.h"
     39#include "posix/stdbool.h"
    4040
    4141#include "internal/common.h"
    42 #include "time.h"
    43 
    44 #include "ctype.h"
    45 #include "errno.h"
    46 #include "signal.h"
    47 #include "assert.h"
     42#include "posix/time.h"
     43
     44#include "posix/ctype.h"
     45#include "posix/errno.h"
     46#include "posix/signal.h"
     47#include "posix/assert.h"
    4848
    4949#include "libc/malloc.h"

  • uspace/lib/posix/source/unistd.c

    r33fee91 ra3da2b2  
    3737
    3838#include "internal/common.h"
    39 #include "unistd.h"
    40 
    41 #include "errno.h"
    42 #include "string.h"
    43 #include "fcntl.h"
     39#include "posix/unistd.h"
     40
     41#include "posix/errno.h"
     42#include "posix/string.h"
     43#include "posix/fcntl.h"
    4444
    4545#include "libc/task.h"
Note: See TracChangeset for help on using the changeset viewer.