From 9909f34c49f79632b622eea7a35c08b20df42650 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 18 Jun 2002 12:36:40 +0000 Subject: 2002-06-18 Ralf Corsepius * Makefile.am: Merge-in include/Makefile.am. * include/Makefile.am: Remove. * configure.ac: Reflect changes above. --- c/src/exec/libblock/ChangeLog | 6 ++++++ c/src/exec/libblock/Makefile.am | 20 +++++++++++++++++++- c/src/exec/libblock/configure.ac | 1 - c/src/exec/libblock/include/Makefile.am | 22 ---------------------- 4 files changed, 25 insertions(+), 24 deletions(-) delete mode 100644 c/src/exec/libblock/include/Makefile.am (limited to 'c/src/exec') 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 + + * Makefile.am: Merge-in include/Makefile.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2002-06-17 Ralf Corsepius * 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 -- cgit v1.2.3