diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-08-21 18:39:59 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-08-21 18:39:59 +0000 |
| commit | cb09a5da6a2da6e13f05acc28c2dcfdc40ce9645 (patch) | |
| tree | 3100a0ad48c48e6bf20dc5c99892a54f032f4c8c /cpukit | |
| parent | 2009-08-21 Roxana Leontie <roxana.leontie@gmail.com> (diff) | |
| download | rtems-cb09a5da6a2da6e13f05acc28c2dcfdc40ce9645.tar.bz2 | |
2009-08-21 Roxana Leontie <roxana.leontie@gmail.com>
* Makefile.am, preinstall.am, libmisc/Makefile.am: Changed the name of
mw-fb directory into fb. Relocated files.
* libmisc/fb/fb.h, libmisc/fb/mw_uid.c, libmisc/fb/mw_uid.h: New files.
* libmisc/mw-fb/fb.h, libmisc/mw-fb/mw_uid.c, libmisc/mw-fb/mw_uid.h:
Removed.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 8 | ||||
| -rw-r--r-- | cpukit/Makefile.am | 4 | ||||
| -rw-r--r-- | cpukit/libmisc/Makefile.am | 5 | ||||
| -rw-r--r-- | cpukit/libmisc/fb/fb.h (renamed from cpukit/libmisc/mw-fb/fb.h) | 0 | ||||
| -rw-r--r-- | cpukit/libmisc/fb/mw_uid.c (renamed from cpukit/libmisc/mw-fb/mw_uid.c) | 0 | ||||
| -rw-r--r-- | cpukit/libmisc/fb/mw_uid.h (renamed from cpukit/libmisc/mw-fb/mw_uid.h) | 0 | ||||
| -rw-r--r-- | cpukit/preinstall.am | 4 |
7 files changed, 14 insertions, 7 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 3162f1848a..52d48dc49e 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,11 @@ +2009-08-21 Roxana Leontie <roxana.leontie@gmail.com> + + * Makefile.am, preinstall.am, libmisc/Makefile.am: Changed the name of + mw-fb directory into fb. Relocated files. + * libmisc/fb/fb.h, libmisc/fb/mw_uid.c, libmisc/fb/mw_uid.h: New files. + * libmisc/mw-fb/fb.h, libmisc/mw-fb/mw_uid.c, libmisc/mw-fb/mw_uid.h: + Removed. + 2009-08-19 Joel Sherrill <joel.sherrill@OARcorp.com> * sapi/include/confdefs.h, score/Makefile.am, diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index a7bf929254..c39f99741b 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -127,8 +127,8 @@ include_rtems_HEADERS += libmisc/dumpbuf/dumpbuf.h ## monitor include_rtems_HEADERS += libmisc/monitor/monitor.h -## mw-fb -include_rtems_HEADERS += libmisc/mw-fb/fb.h libmisc/mw-fb/mw_uid.h +## fb +include_rtems_HEADERS += libmisc/fb/fb.h libmisc/fb/mw_uid.h ## shell if LIBSHELL diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am index fa296cccc7..a17b8041ab 100644 --- a/cpukit/libmisc/Makefile.am +++ b/cpukit/libmisc/Makefile.am @@ -60,10 +60,9 @@ endif EXTRA_DIST += monitor/README -## mw-fb +## fb noinst_LIBRARIES += libmw-fb.a -libmw_fb_a_SOURCES = mw-fb/mw_uid.c mw-fb/fb.h \ - mw-fb/mw_uid.h +libmw_fb_a_SOURCES = fb/mw_uid.c fb/fb.h fb/mw_uid.h ## shell if LIBSHELL diff --git a/cpukit/libmisc/mw-fb/fb.h b/cpukit/libmisc/fb/fb.h index f42a15f0c9..f42a15f0c9 100644 --- a/cpukit/libmisc/mw-fb/fb.h +++ b/cpukit/libmisc/fb/fb.h diff --git a/cpukit/libmisc/mw-fb/mw_uid.c b/cpukit/libmisc/fb/mw_uid.c index dcf0e9d9cb..dcf0e9d9cb 100644 --- a/cpukit/libmisc/mw-fb/mw_uid.c +++ b/cpukit/libmisc/fb/mw_uid.c diff --git a/cpukit/libmisc/mw-fb/mw_uid.h b/cpukit/libmisc/fb/mw_uid.h index 867a28e2e5..867a28e2e5 100644 --- a/cpukit/libmisc/mw-fb/mw_uid.h +++ b/cpukit/libmisc/fb/mw_uid.h diff --git a/cpukit/preinstall.am b/cpukit/preinstall.am index 4f66137f36..8a26282eb0 100644 --- a/cpukit/preinstall.am +++ b/cpukit/preinstall.am @@ -238,11 +238,11 @@ $(PROJECT_INCLUDE)/rtems/monitor.h: libmisc/monitor/monitor.h $(PROJECT_INCLUDE) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/monitor.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/monitor.h -$(PROJECT_INCLUDE)/rtems/fb.h: libmisc/mw-fb/fb.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) +$(PROJECT_INCLUDE)/rtems/fb.h: libmisc/fb/fb.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/fb.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fb.h -$(PROJECT_INCLUDE)/rtems/mw_uid.h: libmisc/mw-fb/mw_uid.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) +$(PROJECT_INCLUDE)/rtems/mw_uid.h: libmisc/fb/mw_uid.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/mw_uid.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/mw_uid.h |