summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--c/src/exec/libfs/ChangeLog4
-rw-r--r--c/src/exec/libfs/src/imfs/Makefile.am19
-rw-r--r--c/src/libfs/ChangeLog4
-rw-r--r--c/src/libfs/src/imfs/Makefile.am19
-rw-r--r--cpukit/libfs/ChangeLog4
-rw-r--r--cpukit/libfs/src/imfs/Makefile.am19
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 <corsepiu@faw.uni-ulm.de>
+
+ * src/imfs/Makefile.am: Cleanup.
+
2001-11-07 Jennifer Averett <jennifer@OARcorp.com>
Reported by Ibragimov Ilya <ibr@oktet.ru> 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 <corsepiu@faw.uni-ulm.de>
+
+ * src/imfs/Makefile.am: Cleanup.
+
2001-11-07 Jennifer Averett <jennifer@OARcorp.com>
Reported by Ibragimov Ilya <ibr@oktet.ru> 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 <corsepiu@faw.uni-ulm.de>
+
+ * src/imfs/Makefile.am: Cleanup.
+
2001-11-07 Jennifer Averett <jennifer@OARcorp.com>
Reported by Ibragimov Ilya <ibr@oktet.ru> 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