This commit is contained in:
Thomas Doerfler
2009-05-05 12:52:29 +00:00
parent 439959bdd8
commit 870d0a22ff
4 changed files with 36 additions and 2 deletions

View File

@@ -44,6 +44,9 @@ include_rtems_bsd_sysdir = $(include_rtemsdir)/bsd/sys
include_rtems_bsd_sys_HEADERS = include/rtems/bsd/sys/queue.h
include_rtems_bsd_sys_HEADERS += include/rtems/bsd/sys/cdefs.h
include_uuiddir = $(includedir)/uuid
include_uuid_HEADERS = libmisc/uuid/uuid.h
if NEWLIB
include_sysdir = $(includedir)/sys
include_sys_HEADERS =
@@ -96,7 +99,8 @@ include_rtems_HEADERS += libblock/include/rtems/bdbuf.h \
libblock/include/rtems/blkdev.h libblock/include/rtems/diskdevs.h \
libblock/include/rtems/flashdisk.h libblock/include/rtems/ramdisk.h \
libblock/include/rtems/nvdisk.h libblock/include/rtems/nvdisk-sram.h \
libblock/include/rtems/ide_part_table.h
libblock/include/rtems/ide_part_table.h \
libblock/include/rtems/bdpart.h
endif
## ftpd

View File

@@ -10,6 +10,7 @@ noinst_LIBRARIES = libblock.a
libblock_a_SOURCES = src/bdbuf.c src/blkdev.c src/diskdevs.c src/flashdisk.c \
src/ramdisk.c src/ide_part_table.c src/nvdisk.c \
src/nvdisk-sram.c \
src/bdpart.c \
include/rtems/bdbuf.h include/rtems/blkdev.h \
include/rtems/diskdevs.h include/rtems/flashdisk.h \
include/rtems/ramdisk.h include/rtems/nvdisk.h include/rtems/nvdisk-sram.h \

View File

@@ -85,7 +85,8 @@ libshell_a_SOURCES = shell/cat_file.c shell/cmds.c shell/internal.h \
shell/err.c shell/errx.c shell/verr.c shell/vis.c \
shell/verrx.c shell/vwarn.c shell/vwarnx.c shell/warn.c shell/warnx.c \
shell/fts.c shell/print_heapinfo.c shell/main_wkspaceinfo.c \
shell/shell_script.c shell/login_prompt.c shell/login_check.c
shell/shell_script.c shell/login_prompt.c shell/login_check.c \
shell/fdisk.c
if LIBNETWORKING
libshell_a_SOURCES += shell/main_mount_ftp.c shell/main_mount_tftp.c \
shell/main_ifconfig.c shell/main_route.c shell/main_netstats.c \
@@ -125,6 +126,21 @@ libfsmount_a_SOURCES = fsmount/fsmount.c fsmount/fsmount.h
EXTRA_DIST += fsmount/README
## uuid
noinst_LIBRARIES += libuuid.a
libuuid_a_SOURCES = uuid/clear.c \
uuid/compare.c \
uuid/copy.c \
uuid/gen_uuid.c \
uuid/isnull.c \
uuid/pack.c \
uuid/parse.c \
uuid/unpack.c \
uuid/unparse.c \
uuid/uuid_time.c \
uuid/uuidd.h \
uuid/uuidP.h
## ---
include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am

View File

@@ -41,6 +41,15 @@ $(PROJECT_INCLUDE)/rtems/bsd/sys/cdefs.h: include/rtems/bsd/sys/cdefs.h $(PROJEC
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bsd/sys/cdefs.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bsd/sys/cdefs.h
$(PROJECT_INCLUDE)/uuid/$(dirstamp):
@$(MKDIR_P) $(PROJECT_INCLUDE)/uuid
@: > $(PROJECT_INCLUDE)/uuid/$(dirstamp)
PREINSTALL_DIRS += $(PROJECT_INCLUDE)/uuid/$(dirstamp)
$(PROJECT_INCLUDE)/uuid/uuid.h: libmisc/uuid/uuid.h $(PROJECT_INCLUDE)/uuid/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/uuid/uuid.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/uuid/uuid.h
if NEWLIB
$(PROJECT_INCLUDE)/sys/$(dirstamp):
@$(MKDIR_P) $(PROJECT_INCLUDE)/sys
@@ -191,6 +200,10 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/nvdisk-sram.h
$(PROJECT_INCLUDE)/rtems/ide_part_table.h: libblock/include/rtems/ide_part_table.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ide_part_table.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ide_part_table.h
$(PROJECT_INCLUDE)/rtems/bdpart.h: libblock/include/rtems/bdpart.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bdpart.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bdpart.h
endif
if LIBNETWORKING
$(PROJECT_INCLUDE)/rtems/ftpd.h: ftpd/ftpd.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)