From f667aaecf0d53fdc6c40ad4a9f84c96318611ea6 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 26 Nov 2001 14:34:09 +0000 Subject: 2001-11-26 Ralf Corsepius * src/imfs/Makefile.am: Cleanup. --- c/src/exec/libfs/ChangeLog | 4 ++++ c/src/exec/libfs/src/imfs/Makefile.am | 19 +++---------------- c/src/libfs/ChangeLog | 4 ++++ c/src/libfs/src/imfs/Makefile.am | 19 +++---------------- cpukit/libfs/ChangeLog | 4 ++++ cpukit/libfs/src/imfs/Makefile.am | 19 +++---------------- 6 files changed, 21 insertions(+), 48 deletions(-) diff --git a/c/src/exec/libfs/ChangeLog b/c/src/exec/libfs/ChangeLog index a9e883da45..bb08ba5a93 100644 --- a/c/src/exec/libfs/ChangeLog +++ b/c/src/exec/libfs/ChangeLog @@ -1,3 +1,7 @@ +2001-11-26 Ralf Corsepius + + * src/imfs/Makefile.am: Cleanup. + 2001-11-07 Jennifer Averett Reported by Ibragimov Ilya and tracked as PR49. diff --git a/c/src/exec/libfs/src/imfs/Makefile.am b/c/src/exec/libfs/src/imfs/Makefile.am index db78379fc9..bd3749c9cb 100644 --- a/c/src/exec/libfs/src/imfs/Makefile.am +++ b/c/src/exec/libfs/src/imfs/Makefile.am @@ -32,32 +32,19 @@ endif C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) include_HEADERS = imfs.h -SYS_H_FILES = -RTEMS_H_FILES = -noinst_HEADERS = include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems \ - $(PROJECT_INCLUDE)/sys $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \ - $(RTEMS_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) \ - $(SYS_H_FILES:%=$(PROJECT_INCLUDE)/sys/%) +PREINSTALL_FILES = $(PROJECT_INCLUDE) \ + $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) $(PROJECT_INCLUDE): @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/rtems: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/sys: - @$(mkinstalldirs) $@ $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -$(PROJECT_INCLUDE)/rtems/%.h: %.h - $(INSTALL_DATA) $< $@ -$(PROJECT_INCLUDE)/sys/%.h: %.h - $(INSTALL_DATA) $< $@ OBJS = $(C_O_FILES) @@ -75,6 +62,6 @@ $(LIB): ${OBJS} DOC_FILES = TODO CASES EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \ - $(UNIX_C_FILES) $(RTEMS_H_FILES) $(SYS_H_FILES) + $(UNIX_C_FILES) include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/libfs/ChangeLog b/c/src/libfs/ChangeLog index a9e883da45..bb08ba5a93 100644 --- a/c/src/libfs/ChangeLog +++ b/c/src/libfs/ChangeLog @@ -1,3 +1,7 @@ +2001-11-26 Ralf Corsepius + + * src/imfs/Makefile.am: Cleanup. + 2001-11-07 Jennifer Averett Reported by Ibragimov Ilya and tracked as PR49. diff --git a/c/src/libfs/src/imfs/Makefile.am b/c/src/libfs/src/imfs/Makefile.am index db78379fc9..bd3749c9cb 100644 --- a/c/src/libfs/src/imfs/Makefile.am +++ b/c/src/libfs/src/imfs/Makefile.am @@ -32,32 +32,19 @@ endif C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) include_HEADERS = imfs.h -SYS_H_FILES = -RTEMS_H_FILES = -noinst_HEADERS = include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems \ - $(PROJECT_INCLUDE)/sys $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \ - $(RTEMS_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) \ - $(SYS_H_FILES:%=$(PROJECT_INCLUDE)/sys/%) +PREINSTALL_FILES = $(PROJECT_INCLUDE) \ + $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) $(PROJECT_INCLUDE): @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/rtems: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/sys: - @$(mkinstalldirs) $@ $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -$(PROJECT_INCLUDE)/rtems/%.h: %.h - $(INSTALL_DATA) $< $@ -$(PROJECT_INCLUDE)/sys/%.h: %.h - $(INSTALL_DATA) $< $@ OBJS = $(C_O_FILES) @@ -75,6 +62,6 @@ $(LIB): ${OBJS} DOC_FILES = TODO CASES EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \ - $(UNIX_C_FILES) $(RTEMS_H_FILES) $(SYS_H_FILES) + $(UNIX_C_FILES) include $(top_srcdir)/../../../automake/local.am diff --git a/cpukit/libfs/ChangeLog b/cpukit/libfs/ChangeLog index a9e883da45..bb08ba5a93 100644 --- a/cpukit/libfs/ChangeLog +++ b/cpukit/libfs/ChangeLog @@ -1,3 +1,7 @@ +2001-11-26 Ralf Corsepius + + * src/imfs/Makefile.am: Cleanup. + 2001-11-07 Jennifer Averett Reported by Ibragimov Ilya and tracked as PR49. diff --git a/cpukit/libfs/src/imfs/Makefile.am b/cpukit/libfs/src/imfs/Makefile.am index db78379fc9..bd3749c9cb 100644 --- a/cpukit/libfs/src/imfs/Makefile.am +++ b/cpukit/libfs/src/imfs/Makefile.am @@ -32,32 +32,19 @@ endif C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) include_HEADERS = imfs.h -SYS_H_FILES = -RTEMS_H_FILES = -noinst_HEADERS = include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems \ - $(PROJECT_INCLUDE)/sys $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \ - $(RTEMS_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) \ - $(SYS_H_FILES:%=$(PROJECT_INCLUDE)/sys/%) +PREINSTALL_FILES = $(PROJECT_INCLUDE) \ + $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) $(PROJECT_INCLUDE): @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/rtems: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/sys: - @$(mkinstalldirs) $@ $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -$(PROJECT_INCLUDE)/rtems/%.h: %.h - $(INSTALL_DATA) $< $@ -$(PROJECT_INCLUDE)/sys/%.h: %.h - $(INSTALL_DATA) $< $@ OBJS = $(C_O_FILES) @@ -75,6 +62,6 @@ $(LIB): ${OBJS} DOC_FILES = TODO CASES EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \ - $(UNIX_C_FILES) $(RTEMS_H_FILES) $(SYS_H_FILES) + $(UNIX_C_FILES) include $(top_srcdir)/../../../automake/local.am -- cgit v1.2.3