Changeset fa73ccb in rtems


Ignore:
Timestamp:
Feb 8, 2005, 4:04:46 AM (15 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
6c6ee53
Parents:
ea68ed5
Message:

2005-02-08 Ralf Corsepius <ralf.corsepius@…>

  • configure.ac: Add new header guard to cpuopts.h.
  • Makefile.am: Add libfs, libblock, ftpd header install rules.
  • libfs/Makefile.am, libblock/Makefile.am, ftpd/Makefile.am: Remove header install rules.
Location:
cpukit
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    rea68ed5 rfa73ccb  
     12005-02-08      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * configure.ac: Add new header guard to cpuopts.h.
     4        * Makefile.am: Add libfs, libblock, ftpd header install rules.
     5        * libfs/Makefile.am, libblock/Makefile.am, ftpd/Makefile.am: Remove
     6        header install rules.
     7
    182005-02-08      Ralf Corsepius <ralf.corsepius@rtems.org>
    29
  • cpukit/Makefile.am

    rea68ed5 rfa73ccb  
    7272    include/rtems/concat.h include/rtems/tar.h
    7373
     74## libfs
     75include_rtems_HEADERS += libfs/src/imfs/imfs.h
     76
     77if !UNIX
     78include_rtems_HEADERS += libfs/src/dosfs/dosfs.h
     79endif
     80
     81## libblock
     82if !UNIX
     83include_rtems_HEADERS += libblock/include/rtems/bdbuf.h \
     84    libblock/include/rtems/blkdev.h libblock/include/rtems/diskdevs.h \
     85    libblock/include/rtems/ramdisk.h \
     86    libblock/include/rtems/ide_part_table.h
     87endif
     88
     89## ftpd
     90if HAS_NETWORKING
     91include_rtems_HEADERS += ftpd/ftpd.h
     92endif
     93
    7494## capture
    7595include_rtems_HEADERS += libmisc/capture/capture.h \
     
    305325PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/tar.h
    306326
     327$(PROJECT_INCLUDE)/rtems/imfs.h: libfs/src/imfs/imfs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
     328        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/imfs.h
     329PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/imfs.h
     330
     331if !UNIX
     332$(PROJECT_INCLUDE)/rtems/dosfs.h: libfs/src/dosfs/dosfs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
     333        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/dosfs.h
     334PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/dosfs.h
     335endif
     336
     337if !UNIX
     338$(PROJECT_INCLUDE)/rtems/bdbuf.h: libblock/include/rtems/bdbuf.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
     339        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bdbuf.h
     340PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bdbuf.h
     341
     342$(PROJECT_INCLUDE)/rtems/blkdev.h: libblock/include/rtems/blkdev.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
     343        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/blkdev.h
     344PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/blkdev.h
     345
     346$(PROJECT_INCLUDE)/rtems/diskdevs.h: libblock/include/rtems/diskdevs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
     347        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/diskdevs.h
     348PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/diskdevs.h
     349
     350$(PROJECT_INCLUDE)/rtems/ramdisk.h: libblock/include/rtems/ramdisk.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
     351        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ramdisk.h
     352PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ramdisk.h
     353
     354$(PROJECT_INCLUDE)/rtems/ide_part_table.h: libblock/include/rtems/ide_part_table.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
     355        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ide_part_table.h
     356PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ide_part_table.h
     357endif
     358
     359if HAS_NETWORKING
     360$(PROJECT_INCLUDE)/rtems/ftpd.h: ftpd/ftpd.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
     361        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ftpd.h
     362PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ftpd.h
     363endif
     364
    307365$(PROJECT_INCLUDE)/rtems/capture.h: libmisc/capture/capture.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
    308366        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/capture.h
  • cpukit/configure.ac

    rea68ed5 rfa73ccb  
    133133/* target cpu dependent options file */
    134134/* automatically generated -- DO NOT EDIT!! */
    135 #ifndef __CPU_OPTIONS_h
    136 #define __CPU_OPTIONS_h
     135#ifndef _CPU_OPTIONS_H
     136#define _CPU_OPTIONS_H
    137137_ACEOF
    138138
  • cpukit/ftpd/Makefile.am

    rea68ed5 rfa73ccb  
    66
    77if HAS_NETWORKING
    8 include_rtemsdir = $(includedir)/rtems
    9 include_rtems_HEADERS = ftpd.h
    10 
    118project_lib_LIBRARIES = libftpd.a
    129libftpd_a_SOURCES = ftpd.c ftpd.h
    13 libftpd_a_CPPFLAGS = $(AM_CPPFLAGS)
    1410endif
    1511
    1612all-local: $(PREINSTALL_FILES)
    1713
    18 PREINSTALL_DIRS =
    19 PREINSTALL_FILES =
    2014TMPINSTALL_FILES =
    2115
     
    2620
    2721if HAS_NETWORKING
    28 $(PROJECT_INCLUDE)/rtems/$(dirstamp):
    29         @$(mkdir_p) $(PROJECT_INCLUDE)/rtems
    30         @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
    31 PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
    32 
    33 $(PROJECT_INCLUDE)/rtems/ftpd.h: ftpd.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
    34         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ftpd.h
    35 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ftpd.h
    36 
    3722$(PROJECT_LIB)/libftpd.a: libftpd.a $(PROJECT_LIB)/$(dirstamp)
    3823        $(INSTALL_DATA) $< $(PROJECT_LIB)/libftpd.a
     
    4025endif
    4126
    42 CLEANFILES = $(PREINSTALL_FILES)
    43 DISTCLEANFILES = $(PREINSTALL_DIRS)
    44 CLEANFILES += $(TMPINSTALL_FILES)
     27CLEANFILES = $(TMPINSTALL_FILES)
    4528
    4629include $(top_srcdir)/automake/local.am
  • cpukit/libblock/Makefile.am

    rea68ed5 rfa73ccb  
    66include $(top_srcdir)/automake/compile.am
    77
    8 CLEANFILES =
    9 
    108if !UNIX
    11 include_rtemsdir = $(includedir)/rtems
    12 
    139noinst_LIBRARIES = libblock.a
    14 libblock_a_CPPFLAGS = $(AM_CPPFLAGS)
    15 
    16 include_rtems_HEADERS = include/rtems/bdbuf.h include/rtems/blkdev.h \
     10libblock_a_SOURCES = src/bdbuf.c src/blkdev.c src/diskdevs.c src/ramdisk.c \
     11    src/ide_part_table.c include/rtems/bdbuf.h include/rtems/blkdev.h \
    1712    include/rtems/diskdevs.h include/rtems/ramdisk.h \
    1813    include/rtems/ide_part_table.h
    19 
    20 libblock_a_SOURCES = src/bdbuf.c src/blkdev.c src/diskdevs.c src/ramdisk.c \
    21     src/ide_part_table.c
    2214
    2315all-local: $(PREINSTALL_FILES)
    2416endif
    2517
    26 PREINSTALL_DIRS =
    27 PREINSTALL_FILES =
    28 
    29 if !UNIX
    30 $(PROJECT_INCLUDE)/rtems/$(dirstamp):
    31         @$(mkdir_p) $(PROJECT_INCLUDE)/rtems
    32         @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
    33 PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
    34 
    35 $(PROJECT_INCLUDE)/rtems/bdbuf.h: include/rtems/bdbuf.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
    36         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bdbuf.h
    37 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bdbuf.h
    38 
    39 $(PROJECT_INCLUDE)/rtems/blkdev.h: include/rtems/blkdev.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
    40         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/blkdev.h
    41 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/blkdev.h
    42 
    43 $(PROJECT_INCLUDE)/rtems/diskdevs.h: include/rtems/diskdevs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
    44         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/diskdevs.h
    45 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/diskdevs.h
    46 
    47 $(PROJECT_INCLUDE)/rtems/ramdisk.h: include/rtems/ramdisk.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
    48         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ramdisk.h
    49 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ramdisk.h
    50 
    51 $(PROJECT_INCLUDE)/rtems/ide_part_table.h: include/rtems/ide_part_table.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
    52         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ide_part_table.h
    53 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ide_part_table.h
    54 endif
    55 
    56 CLEANFILES += $(PREINSTALL_FILES)
    57 DISTCLEANFILES = $(PREINSTALL_DIRS)
    58 
    5918include $(top_srcdir)/automake/local.am
  • cpukit/libfs/Makefile.am

    rea68ed5 rfa73ccb  
    88EXTRA_DIST = README
    99
    10 include_rtemsdir = $(includedir)/rtems
    11 include_rtems_HEADERS =
    12 
    1310noinst_LIBRARIES = libimfs.a
    14 libimfs_a_CPPFLAGS = $(AM_CPPFLAGS)
    1511
    1612libimfs_a_SOURCES =
     
    3127    src/imfs/imfs_debug.c src/imfs/imfs_rmnod.c src/imfs/imfs_symlink.c \
    3228    src/imfs/imfs_readlink.c src/imfs/imfs_fdatasync.c src/imfs/imfs_fcntl.c \
    33     src/imfs/ioman.c src/imfs/miniimfs_init.c src/imfs/imfs_load_tar.c
     29    src/imfs/ioman.c src/imfs/miniimfs_init.c src/imfs/imfs_load_tar.c \
     30    src/imfs/imfs.h
    3431endif
    35 
    36 include_rtems_HEADERS += src/imfs/imfs.h
    3732
    3833# dosfs
     
    4035if !UNIX
    4136noinst_LIBRARIES += libdosfs.a
    42 libdosfs_a_CPPFLAGS = $(AM_CPPFLAGS)
    4337
    4438# libdosfs_FATFS_C_FILES
     
    5448    src/dosfs/msdos_initsupp.c src/dosfs/msdos_misc.c \
    5549    src/dosfs/msdos_mknod.c src/dosfs/msdos_node_type.c \
    56     src/dosfs/msdos_conv.c src/dosfs/msdos.h src/dosfs/msdos_format.c
    57 
    58 include_rtems_HEADERS += src/dosfs/dosfs.h
     50    src/dosfs/msdos_conv.c src/dosfs/msdos.h src/dosfs/msdos_format.c \
     51    src/dosfs/dosfs.h
    5952endif
    60 
    61 EXTRA_DIST += $(UNUSED_FILES)
    6253
    6354all-local: $(PREINSTALL_FILES)
     
    6556# ---
    6657
    67 PREINSTALL_DIRS =
    68 PREINSTALL_FILES =
    69 
    70 $(PROJECT_INCLUDE)/rtems/$(dirstamp):
    71         @$(mkdir_p) $(PROJECT_INCLUDE)/rtems
    72         @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
    73 PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
    74 
    75 $(PROJECT_INCLUDE)/rtems/imfs.h: src/imfs/imfs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
    76         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/imfs.h
    77 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/imfs.h
    78 
    79 if !UNIX
    80 $(PROJECT_INCLUDE)/rtems/dosfs.h: src/dosfs/dosfs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
    81         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/dosfs.h
    82 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/dosfs.h
    83 endif
    84 
    85 CLEANFILES = $(PREINSTALL_FILES)
    86 DISTCLEANFILES = $(PREINSTALL_DIRS)
    87 
    8858include $(top_srcdir)/automake/local.am
Note: See TracChangeset for help on using the changeset viewer.