Changeset 870d0a2 in rtems


Ignore:
Timestamp:
May 5, 2009, 12:52:29 PM (10 years ago)
Author:
Thomas Doerfler <Thomas.Doerfler@…>
Branches:
4.10, 4.11, master
Children:
834df50
Parents:
439959b
Message:

Update

Location:
cpukit
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • cpukit/Makefile.am

    r439959b r870d0a2  
    4444include_rtems_bsd_sys_HEADERS = include/rtems/bsd/sys/queue.h
    4545include_rtems_bsd_sys_HEADERS += include/rtems/bsd/sys/cdefs.h
     46
     47include_uuiddir = $(includedir)/uuid
     48include_uuid_HEADERS = libmisc/uuid/uuid.h
    4649
    4750if NEWLIB
     
    97100    libblock/include/rtems/flashdisk.h libblock/include/rtems/ramdisk.h \
    98101    libblock/include/rtems/nvdisk.h libblock/include/rtems/nvdisk-sram.h \
    99     libblock/include/rtems/ide_part_table.h
     102    libblock/include/rtems/ide_part_table.h \
     103    libblock/include/rtems/bdpart.h
    100104endif
    101105
  • cpukit/libblock/Makefile.am

    r439959b r870d0a2  
    1111    src/ramdisk.c src/ide_part_table.c src/nvdisk.c \
    1212    src/nvdisk-sram.c \
     13    src/bdpart.c \
    1314    include/rtems/bdbuf.h include/rtems/blkdev.h \
    1415    include/rtems/diskdevs.h include/rtems/flashdisk.h \
  • cpukit/libmisc/Makefile.am

    r439959b r870d0a2  
    8686    shell/verrx.c shell/vwarn.c shell/vwarnx.c shell/warn.c shell/warnx.c \
    8787    shell/fts.c shell/print_heapinfo.c shell/main_wkspaceinfo.c \
    88     shell/shell_script.c shell/login_prompt.c shell/login_check.c
     88    shell/shell_script.c shell/login_prompt.c shell/login_check.c \
     89    shell/fdisk.c
    8990if LIBNETWORKING
    9091libshell_a_SOURCES += shell/main_mount_ftp.c shell/main_mount_tftp.c \
     
    126127EXTRA_DIST += fsmount/README
    127128
     129## uuid
     130noinst_LIBRARIES += libuuid.a
     131libuuid_a_SOURCES = uuid/clear.c \
     132        uuid/compare.c \
     133        uuid/copy.c \
     134        uuid/gen_uuid.c \
     135        uuid/isnull.c \
     136        uuid/pack.c \
     137        uuid/parse.c \
     138        uuid/unpack.c \
     139        uuid/unparse.c \
     140        uuid/uuid_time.c \
     141        uuid/uuidd.h \
     142        uuid/uuidP.h
     143
    128144## ---
    129145include $(srcdir)/preinstall.am
  • cpukit/preinstall.am

    r439959b r870d0a2  
    4141        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bsd/sys/cdefs.h
    4242PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bsd/sys/cdefs.h
     43
     44$(PROJECT_INCLUDE)/uuid/$(dirstamp):
     45        @$(MKDIR_P) $(PROJECT_INCLUDE)/uuid
     46        @: > $(PROJECT_INCLUDE)/uuid/$(dirstamp)
     47PREINSTALL_DIRS += $(PROJECT_INCLUDE)/uuid/$(dirstamp)
     48
     49$(PROJECT_INCLUDE)/uuid/uuid.h: libmisc/uuid/uuid.h $(PROJECT_INCLUDE)/uuid/$(dirstamp)
     50        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/uuid/uuid.h
     51PREINSTALL_FILES += $(PROJECT_INCLUDE)/uuid/uuid.h
    4352
    4453if NEWLIB
     
    192201        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ide_part_table.h
    193202PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ide_part_table.h
     203
     204$(PROJECT_INCLUDE)/rtems/bdpart.h: libblock/include/rtems/bdpart.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
     205        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bdpart.h
     206PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bdpart.h
    194207endif
    195208if LIBNETWORKING
Note: See TracChangeset for help on using the changeset viewer.