From f2954e0cd4bbbdb28627da07cc21901b81b8dd4d Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Sat, 22 Nov 2003 12:51:28 +0000
Subject: 2003-11-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* Makefile.am: Reworked.
---
 cpukit/libblock/ChangeLog   |  4 ++++
 cpukit/libblock/Makefile.am | 42 +++++++++++++++++++++++++++++-------------
 2 files changed, 33 insertions(+), 13 deletions(-)

(limited to 'cpukit')

diff --git a/cpukit/libblock/ChangeLog b/cpukit/libblock/ChangeLog
index 749b2c15c4..24016f0330 100644
--- a/cpukit/libblock/ChangeLog
+++ b/cpukit/libblock/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Reworked.
+
 2003-11-20	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: AM_CPPFLAGS += -I$(top_builddir).
diff --git a/cpukit/libblock/Makefile.am b/cpukit/libblock/Makefile.am
index e2fc60eb1d..f3c5813488 100644
--- a/cpukit/libblock/Makefile.am
+++ b/cpukit/libblock/Makefile.am
@@ -8,24 +8,14 @@ include $(top_srcdir)/automake/lib.am
 
 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_HEADERS = include/rtems/bdbuf.h include/rtems/blkdev.h \
     include/rtems/diskdevs.h include/rtems/ramdisk.h \
     include/rtems/ide_part_table.h
 
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
-    $(include_rtems_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
-
 LIB = ${ARCH}/libblock.a
 
-C_FILES = src/bdbuf.c src/blkdev.c src/diskdevs.c src/ramdisk.c\
-          src/ide_part_table.c
+C_FILES = src/bdbuf.c src/blkdev.c src/diskdevs.c src/ramdisk.c \
+    src/ide_part_table.c
 
 OBJS = $(C_FILES:src/%.c=${ARCH}/%.$(OBJEXT))
 
@@ -40,4 +30,30 @@ $(LIB): ${OBJS}
 
 all-local: $(PREINSTALL_FILES) ${ARCH} $(LIB)
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/rtems:
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems
+
+$(PROJECT_INCLUDE)/rtems/bdbuf.h: include/rtems/bdbuf.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bdbuf.h
+
+$(PROJECT_INCLUDE)/rtems/blkdev.h: include/rtems/blkdev.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/blkdev.h
+
+$(PROJECT_INCLUDE)/rtems/diskdevs.h: include/rtems/diskdevs.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/diskdevs.h
+
+$(PROJECT_INCLUDE)/rtems/ramdisk.h: include/rtems/ramdisk.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ramdisk.h
+
+$(PROJECT_INCLUDE)/rtems/ide_part_table.h: include/rtems/ide_part_table.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ide_part_table.h
+
 include $(top_srcdir)/automake/local.am
-- 
cgit v1.2.3