diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2010-07-01 14:51:25 +0000 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2010-07-01 14:51:25 +0000 |
| commit | e8cec9e302d55561fd08128f708e440270f944d5 (patch) | |
| tree | f38f86c3a05d151b3ba8864866f548290678d2f0 /cpukit | |
| parent | 2010-06-10 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff) | |
| download | rtems-e8cec9e302d55561fd08128f708e440270f944d5.tar.bz2 | |
2010-06-14 Sebastian Huber <sebastian.huber@embedded-brains.de>
PR 1555/cpukit
* Makefile.am, preinstall.am: Install md4.h and md5.h headers.
2010-06-14 Sebastian Huber <sebastian.huber@embedded-brains.de>
* sapi/include/confdefs.h: Do not define a filesystem if
CONFIGURE_APPLICATION_DISABLE_FILESYSTEM is defined.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 10 | ||||
| -rw-r--r-- | cpukit/Makefile.am | 4 | ||||
| -rw-r--r-- | cpukit/preinstall.am | 8 | ||||
| -rw-r--r-- | cpukit/sapi/include/confdefs.h | 14 |
4 files changed, 29 insertions, 7 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 2c4d1ae824..1fa4293bb0 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -154,6 +154,16 @@ Include <inttypes.h>. Misc. 64bit-compatibility fixes. +2010-06-14 Sebastian Huber <sebastian.huber@embedded-brains.de> + + PR 1555/cpukit + * Makefile.am, preinstall.am: Install md4.h and md5.h headers. + +2010-06-14 Sebastian Huber <sebastian.huber@embedded-brains.de> + + * sapi/include/confdefs.h: Do not define a filesystem if + CONFIGURE_APPLICATION_DISABLE_FILESYSTEM is defined. + 2010-06-14 Ralf Corsépius <ralf.corsepius@rtems.org> * libnetworking/rtems/mkrootfs.h, diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index dfe7ebd2f7..943d1fd0dd 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -52,7 +52,9 @@ if NEWLIB include_sysdir = $(includedir)/sys include_sys_HEADERS = -include_HEADERS += libnetworking/memory.h +include_HEADERS += libnetworking/memory.h \ + libmd/md4.h \ + libmd/md5.h include_sys_HEADERS += libcsupport/include/sys/ioccom.h \ libcsupport/include/sys/filio.h libcsupport/include/sys/ioctl.h \ diff --git a/cpukit/preinstall.am b/cpukit/preinstall.am index 8b9911081d..b430f793c2 100644 --- a/cpukit/preinstall.am +++ b/cpukit/preinstall.am @@ -60,6 +60,14 @@ $(PROJECT_INCLUDE)/memory.h: libnetworking/memory.h $(PROJECT_INCLUDE)/$(dirstam $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/memory.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/memory.h +$(PROJECT_INCLUDE)/md4.h: libmd/md4.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/md4.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/md4.h + +$(PROJECT_INCLUDE)/md5.h: libmd/md5.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/md5.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/md5.h + $(PROJECT_INCLUDE)/sys/ioccom.h: libcsupport/include/sys/ioccom.h $(PROJECT_INCLUDE)/sys/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ioccom.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ioccom.h diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h index 3985bfbf6e..7df2851abc 100644 --- a/cpukit/sapi/include/confdefs.h +++ b/cpukit/sapi/include/confdefs.h @@ -253,12 +253,14 @@ rtems_fs_init_functions_t rtems_fs_init_helper = * If the base filesystem is DEVFS define it else define IMFS. * We will have either DEVFS or IMFS defined after this. */ - #if defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM) - #define CONFIGURE_FILESYSTEM_DEVFS - #elif defined(CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM) - #define CONFIGURE_FILESYSTEM_miniIMFS - #elif !defined(CONFIGURE_FILESYSTEM_IMFS) - #define CONFIGURE_FILESYSTEM_IMFS + #if !defined(CONFIGURE_APPLICATION_DISABLE_FILESYSTEM) + #if defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM) + #define CONFIGURE_FILESYSTEM_DEVFS + #elif defined(CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM) + #define CONFIGURE_FILESYSTEM_miniIMFS + #elif !defined(CONFIGURE_FILESYSTEM_IMFS) + #define CONFIGURE_FILESYSTEM_IMFS + #endif #endif #endif |