diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-21 15:39:38 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-21 15:39:38 +0000 |
| commit | f3f9b55d21fc75cdcb0b91260bdaf14ac5df4a74 (patch) | |
| tree | 8030c906125fed6119ec3ea9db84d81367b1eb44 | |
| parent | 2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-f3f9b55d21fc75cdcb0b91260bdaf14ac5df4a74.tar.bz2 | |
2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add PREINSTALL_DIRS.
| -rw-r--r-- | c/src/libchip/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/libchip/Makefile.am | 6 | ||||
| -rw-r--r-- | c/src/librtems++/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/librtems++/Makefile.am | 4 |
4 files changed, 15 insertions, 3 deletions
diff --git a/c/src/libchip/ChangeLog b/c/src/libchip/ChangeLog index b5e1eaca87..ea21e0dabc 100644 --- a/c/src/libchip/ChangeLog +++ b/c/src/libchip/ChangeLog @@ -1,3 +1,7 @@ +2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Add PREINSTALL_DIRS. + 2004-01-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Fix typo in previous patch. diff --git a/c/src/libchip/Makefile.am b/c/src/libchip/Makefile.am index dca579ca80..30b577fda8 100644 --- a/c/src/libchip/Makefile.am +++ b/c/src/libchip/Makefile.am @@ -141,13 +141,14 @@ EXTRA_DIST += shmdr/README all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) +PREINSTALL_DIRS = PREINSTALL_FILES = TMPINSTALL_FILES = $(PROJECT_INCLUDE)/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE) @: > $(PROJECT_INCLUDE)/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_LIB)/$(dirstamp): @$(mkdir_p) $(PROJECT_LIB) @@ -158,7 +159,7 @@ if LIBCHIP $(PROJECT_INCLUDE)/libchip/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/libchip @: > $(PROJECT_INCLUDE)/libchip/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/$(dirstamp) endif if LIBCHIP @@ -266,6 +267,7 @@ TMPINSTALL_FILES += $(PROJECT_LIB)/shmdr$(LIB_VARIANT).rel endif CLEANFILES += $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/automake/local.am diff --git a/c/src/librtems++/ChangeLog b/c/src/librtems++/ChangeLog index 76d35cbd38..de0f084261 100644 --- a/c/src/librtems++/ChangeLog +++ b/c/src/librtems++/ChangeLog @@ -1,3 +1,7 @@ +2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Add PREINSTALL_DIRS. + 2004-01-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * configure.ac: Add subdir-objects to AUTOMAKE_OPTIONS diff --git a/c/src/librtems++/Makefile.am b/c/src/librtems++/Makefile.am index 6b128371fa..6fb5a2be7f 100644 --- a/c/src/librtems++/Makefile.am +++ b/c/src/librtems++/Makefile.am @@ -36,6 +36,7 @@ endif all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) +PREINSTALL_DIRS = PREINSTALL_FILES = TMPINSTALL_FILES = @@ -48,7 +49,7 @@ if HAS_CXX $(PROJECT_INCLUDE)/rtems++/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/rtems++ @: > $(PROJECT_INCLUDE)/rtems++/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems++/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems++/$(dirstamp) $(PROJECT_INCLUDE)/rtems++/rtemsEvent.h: include/rtems++/rtemsEvent.h $(PROJECT_INCLUDE)/rtems++/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems++/rtemsEvent.h @@ -88,6 +89,7 @@ TMPINSTALL_FILES += $(PROJECT_LIB)/librtems++$(LIB_VARIANT).a endif CLEANFILES += $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../automake/local.am |