diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-14 05:20:59 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-14 05:20:59 +0000 |
| commit | 5c24afe96ea214258db61cf85b5df867a4d8bbd7 (patch) | |
| tree | 4cdcfd2a10a68e2e62f5fbf834499b40fc97dc30 /cpukit | |
| parent | 2004-01-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-5c24afe96ea214258db61cf85b5df867a4d8bbd7.tar.bz2 | |
2004-01-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Re-add dirstamps to PREINSTALL_FILES.
Add PREINSTALL_FILES to CLEANFILES.
* automake/local.am: Remove depend-am.
* automake/subdirs.am: Remove depend-recursive.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 7 | ||||
| -rw-r--r-- | cpukit/Makefile.am | 3 | ||||
| -rw-r--r-- | cpukit/automake/local.am | 6 | ||||
| -rw-r--r-- | cpukit/automake/subdirs.am | 4 |
4 files changed, 12 insertions, 8 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 79524653d8..1c9b7d0655 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,10 @@ +2004-01-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Re-add dirstamps to PREINSTALL_FILES. + Add PREINSTALL_FILES to CLEANFILES. + * automake/local.am: Remove depend-am. + * automake/subdirs.am: Remove depend-recursive. + 2004-01-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * configure.ac: Requires automake >= 1.8.1. diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index db414b7b8f..833e4bba14 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -28,6 +28,7 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/rtems @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/$(dirstamp) $(PROJECT_INCLUDE)/rtems/bspIo.h: include/rtems/bspIo.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bspIo.h @@ -45,5 +46,7 @@ $(PROJECT_INCLUDE)/rtems/stdint.h: include/rtems/stdint.h $(PROJECT_INCLUDE)/rte $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/stdint.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/stdint.h +CLEANFILES += $(PREINSTALL_FILES) + include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/automake/local.am b/cpukit/automake/local.am index 723c12fd84..9e8c9e804e 100644 --- a/cpukit/automake/local.am +++ b/cpukit/automake/local.am @@ -4,7 +4,5 @@ preinstall-am: $(PREINSTALL_FILES) preinstall: preinstall-am .PHONY: preinstall preinstall-am -depend-am: -depend: depend-am -.PHONY: depend depend-am - +depend: +.PHONY: depend diff --git a/cpukit/automake/subdirs.am b/cpukit/automake/subdirs.am index 3d54285dec..00eba7cd1d 100644 --- a/cpukit/automake/subdirs.am +++ b/cpukit/automake/subdirs.am @@ -7,7 +7,6 @@ ## Once automake is fully integrated these make targets ## and this file will probably be removed -depend-recursive \ preinstall-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ @@ -31,6 +30,3 @@ preinstall-recursive: preinstall: preinstall-recursive .PHONY: preinstall-recursive - -depend: depend-recursive -.PHONY: depend-recursive |