diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-06-18 12:36:40 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-06-18 12:36:40 +0000 |
| commit | 9909f34c49f79632b622eea7a35c08b20df42650 (patch) | |
| tree | e48386ca0795acbbd5ec7ea665d2ce1f631d8e29 | |
| parent | 2002-06-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-9909f34c49f79632b622eea7a35c08b20df42650.tar.bz2 | |
2002-06-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in include/Makefile.am.
* include/Makefile.am: Remove.
* configure.ac: Reflect changes above.
| -rw-r--r-- | c/src/exec/libblock/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/exec/libblock/Makefile.am | 20 | ||||
| -rw-r--r-- | c/src/exec/libblock/configure.ac | 1 | ||||
| -rw-r--r-- | c/src/exec/libblock/include/Makefile.am | 22 | ||||
| -rw-r--r-- | cpukit/libblock/ChangeLog | 6 | ||||
| -rw-r--r-- | cpukit/libblock/Makefile.am | 20 | ||||
| -rw-r--r-- | cpukit/libblock/configure.ac | 1 |
7 files changed, 50 insertions, 26 deletions
diff --git a/c/src/exec/libblock/ChangeLog b/c/src/exec/libblock/ChangeLog index 6f41061803..c415156308 100644 --- a/c/src/exec/libblock/ChangeLog +++ b/c/src/exec/libblock/ChangeLog @@ -1,3 +1,9 @@ +2002-06-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merge-in include/Makefile.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * include/Makefile.am: Include $(top_srcdir)/../automake/*.am. diff --git a/c/src/exec/libblock/Makefile.am b/c/src/exec/libblock/Makefile.am index 1f68c561e5..85a2b6af6a 100644 --- a/c/src/exec/libblock/Makefile.am +++ b/c/src/exec/libblock/Makefile.am @@ -4,7 +4,25 @@ ACLOCAL_AMFLAGS = -I ../aclocal -SUBDIRS = include src +SUBDIRS = src + +include_rtemsdir = $(includedir)/rtems + +$(PROJECT_INCLUDE)/%.h: include/%.h + $(INSTALL_DATA) $< $@ + +$(PROJECT_INCLUDE)/rtems: + @$(mkinstalldirs) $@ + +include_rtems_HEADERS = \ + include/rtems/bdbuf.h include/rtems/blkdev.h \ + include/rtems/diskdevs.h include/rtems/ramdisk.h + +PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \ + $(include_rtems_HEADERS:include/%=$(PROJECT_INCLUDE)/%) + +all-local: $(PREINSTALL_FILES) + EXTRA_DIST = README diff --git a/c/src/exec/libblock/configure.ac b/c/src/exec/libblock/configure.ac index 99af3908d0..a467d53f18 100644 --- a/c/src/exec/libblock/configure.ac +++ b/c/src/exec/libblock/configure.ac @@ -24,7 +24,6 @@ RTEMS_PROJECT_ROOT # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile -include/Makefile src/Makefile ]) AC_OUTPUT diff --git a/c/src/exec/libblock/include/Makefile.am b/c/src/exec/libblock/include/Makefile.am deleted file mode 100644 index 723f5907c0..0000000000 --- a/c/src/exec/libblock/include/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## -## $Id$ -## - - -include_rtemsdir = $(includedir)/rtems - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/rtems: - @$(mkinstalldirs) $@ - -include_rtems_HEADERS = \ - rtems/bdbuf.h rtems/blkdev.h rtems/diskdevs.h rtems/ramdisk.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \ - $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%) - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../automake/local.am diff --git a/cpukit/libblock/ChangeLog b/cpukit/libblock/ChangeLog index 6f41061803..c415156308 100644 --- a/cpukit/libblock/ChangeLog +++ b/cpukit/libblock/ChangeLog @@ -1,3 +1,9 @@ +2002-06-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merge-in include/Makefile.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * include/Makefile.am: Include $(top_srcdir)/../automake/*.am. diff --git a/cpukit/libblock/Makefile.am b/cpukit/libblock/Makefile.am index 1f68c561e5..85a2b6af6a 100644 --- a/cpukit/libblock/Makefile.am +++ b/cpukit/libblock/Makefile.am @@ -4,7 +4,25 @@ ACLOCAL_AMFLAGS = -I ../aclocal -SUBDIRS = include src +SUBDIRS = src + +include_rtemsdir = $(includedir)/rtems + +$(PROJECT_INCLUDE)/%.h: include/%.h + $(INSTALL_DATA) $< $@ + +$(PROJECT_INCLUDE)/rtems: + @$(mkinstalldirs) $@ + +include_rtems_HEADERS = \ + include/rtems/bdbuf.h include/rtems/blkdev.h \ + include/rtems/diskdevs.h include/rtems/ramdisk.h + +PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \ + $(include_rtems_HEADERS:include/%=$(PROJECT_INCLUDE)/%) + +all-local: $(PREINSTALL_FILES) + EXTRA_DIST = README diff --git a/cpukit/libblock/configure.ac b/cpukit/libblock/configure.ac index 99af3908d0..a467d53f18 100644 --- a/cpukit/libblock/configure.ac +++ b/cpukit/libblock/configure.ac @@ -24,7 +24,6 @@ RTEMS_PROJECT_ROOT # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile -include/Makefile src/Makefile ]) AC_OUTPUT |