summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-12-12 16:04:17 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-12-12 16:04:17 +0000
commit375e890cf306e17a775b39eb5d876d92619f55b3 (patch)
treeee3c49e10619cb5ce2880305a993275870ac55ec
parent2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-375e890cf306e17a775b39eb5d876d92619f55b3.tar.bz2
2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES.
-rw-r--r--c/src/libchip/ChangeLog4
-rw-r--r--c/src/libchip/Makefile.am15
-rw-r--r--c/src/librtems++/ChangeLog4
-rw-r--r--c/src/librtems++/Makefile.am7
-rw-r--r--c/src/optman/ChangeLog4
-rw-r--r--c/src/optman/Makefile.am4
6 files changed, 30 insertions, 8 deletions
diff --git a/c/src/libchip/ChangeLog b/c/src/libchip/ChangeLog
index b07198e9a1..eda09d9064 100644
--- a/c/src/libchip/ChangeLog
+++ b/c/src/libchip/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES.
+
2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Fix variant-tmpinstall support.
diff --git a/c/src/libchip/Makefile.am b/c/src/libchip/Makefile.am
index 1fb45433e8..174f2d8717 100644
--- a/c/src/libchip/Makefile.am
+++ b/c/src/libchip/Makefile.am
@@ -25,7 +25,7 @@ include_libchip_HEADERS += ide/ata.h ide/ide_ctrl_cfg.h ide/ide_ctrl.h \
ide/ide_ctrl_io.h
ide/$(ARCH)/$(dirstamp):
- @$(mkinstalldirs) ide/$(ARCH)
+ @$(mkdir_p) ide/$(ARCH)
@: > ide/$(ARCH)/$(dirstamp)
ide/$(ARCH)/%.$(OBJEXT): ide/%.c ide/$(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
@@ -52,7 +52,7 @@ include_libchip_HEADERS += network/cs8900.h network/i82586var.h \
network/open_eth.h
network/$(ARCH)/$(dirstamp):
- @$(mkinstalldirs) network/$(ARCH)
+ @$(mkdir_p) network/$(ARCH)
@: > network/$(ARCH)/$(dirstamp)
network/$(ARCH)/%.$(OBJEXT): network/%.c network/$(ARCH)/$(dirstamp)
${COMPILE} $(libnetchip_CPPFLAGS) -o $@ -c $<
@@ -81,7 +81,7 @@ if LIBCHIP
include_libchip_HEADERS += rtc/rtc.h rtc/icm7170.h rtc/m48t08.h
rtc/$(ARCH)/$(dirstamp):
- @$(mkinstalldirs) rtc/$(ARCH)
+ @$(mkdir_p) rtc/$(ARCH)
@: > rtc/$(ARCH)/$(dirstamp)
rtc/$(ARCH)/%.$(OBJEXT): rtc/%.c rtc/$(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
@@ -111,7 +111,7 @@ include_libchip_HEADERS += serial/mc68681.h serial/ns16550.h serial/z85c30.h \
serial/serial.h serial/sersupp.h
serial/$(ARCH)/$(dirstamp):
- @$(mkinstalldirs) serial/$(ARCH)
+ @$(mkdir_p) serial/$(ARCH)
@: > serial/$(ARCH)/$(dirstamp)
serial/$(ARCH)/%.$(OBJEXT): serial/%.c serial/$(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
@@ -131,11 +131,14 @@ CLEANDIRS = */$(ARCH)
PREINSTALL_FILES =
+${PROJECT_RELEASE}/lib/$(dirstamp):
+ @$(mkdir_p) ${PROJECT_RELEASE}/lib
+ @: > ${PROJECT_RELEASE}/lib/$(dirstamp)
+
if LIBCHIP
$(PROJECT_INCLUDE)/libchip/$(dirstamp):
- @$(mkinstalldirs) $(PROJECT_INCLUDE)/libchip
+ @$(mkdir_p) $(PROJECT_INCLUDE)/libchip
@: > $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/$(dirstamp)
endif
if LIBCHIP
diff --git a/c/src/librtems++/ChangeLog b/c/src/librtems++/ChangeLog
index c54e253aaa..691625e3ac 100644
--- a/c/src/librtems++/ChangeLog
+++ b/c/src/librtems++/ChangeLog
@@ -1,5 +1,9 @@
2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+ * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES.
+
+2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
* configure.ac: Require automake >= 1.8, autoconf >= 2.59.
2003-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
diff --git a/c/src/librtems++/Makefile.am b/c/src/librtems++/Makefile.am
index cbdd417928..7af1e2ad9a 100644
--- a/c/src/librtems++/Makefile.am
+++ b/c/src/librtems++/Makefile.am
@@ -34,11 +34,14 @@ all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
PREINSTALL_FILES =
+${PROJECT_RELEASE}/lib/$(dirstamp):
+ @$(mkdir_p) ${PROJECT_RELEASE}/lib
+ @: > ${PROJECT_RELEASE}/lib/$(dirstamp)
+
if HAS_CXX
$(PROJECT_INCLUDE)/rtems++/$(dirstamp):
- @$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems++
+ @$(mkdir_p) $(PROJECT_INCLUDE)/rtems++
@: > $(PROJECT_INCLUDE)/rtems++/$(dirstamp)
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems++/$(dirstamp)
$(PROJECT_INCLUDE)/rtems++/rtemsEvent.h: include/rtems++/rtemsEvent.h $(PROJECT_INCLUDE)/rtems++/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems++/rtemsEvent.h
diff --git a/c/src/optman/ChangeLog b/c/src/optman/ChangeLog
index 357e8bf89f..d12300759c 100644
--- a/c/src/optman/ChangeLog
+++ b/c/src/optman/ChangeLog
@@ -1,5 +1,9 @@
2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+ * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES.
+
+2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
* Makefile.am: Remove project_libdir.
2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
diff --git a/c/src/optman/Makefile.am b/c/src/optman/Makefile.am
index fc3a882166..a663899f0d 100644
--- a/c/src/optman/Makefile.am
+++ b/c/src/optman/Makefile.am
@@ -40,6 +40,10 @@ all-local: $(PGMS) $(TMPINSTALL_FILES)
EXTRA_DIST = $(rtems_C_FILES) $(sapi_C_FILES)
+${PROJECT_RELEASE}/lib/$(dirstamp):
+ @$(mkdir_p) ${PROJECT_RELEASE}/lib
+ @: > ${PROJECT_RELEASE}/lib/$(dirstamp)
+
${PROJECT_RELEASE}/lib/no-ext$(LIB_VARIANT).rel: $(ARCH)/no-ext$(LIB_VARIANT).rel ${PROJECT_RELEASE}/lib/$(dirstamp)
$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/no-ext$(LIB_VARIANT).rel
TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/no-ext$(LIB_VARIANT).rel