diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-09-05 15:35:34 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-09-05 15:35:34 +0000 |
| commit | 178fae8e295c29fb79809c5b449fcdfe8539703a (patch) | |
| tree | 30ec16fe85fb9727f456d0b71a4935dbd93035c0 /c/src/exec | |
| parent | 2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-178fae8e295c29fb79809c5b449fcdfe8539703a.tar.bz2 | |
2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Include compile.am, formatting.
* rtems/Makefile.am: Formatting.
* rtems/score/Makefile.am: Formatting.
Diffstat (limited to 'c/src/exec')
| -rw-r--r-- | c/src/exec/score/cpu/arm/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/exec/score/cpu/arm/Makefile.am | 8 | ||||
| -rw-r--r-- | c/src/exec/score/cpu/arm/rtems/Makefile.am | 4 | ||||
| -rw-r--r-- | c/src/exec/score/cpu/arm/rtems/score/Makefile.am | 9 |
4 files changed, 17 insertions, 10 deletions
diff --git a/c/src/exec/score/cpu/arm/ChangeLog b/c/src/exec/score/cpu/arm/ChangeLog index 43e0ab1d2e..775b73c3c3 100644 --- a/c/src/exec/score/cpu/arm/ChangeLog +++ b/c/src/exec/score/cpu/arm/ChangeLog @@ -1,3 +1,9 @@ +2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Include compile.am, formatting. + * rtems/Makefile.am: Formatting. + * rtems/score/Makefile.am: Formatting. + 2000-08-29 Joel Sherrill <joel.sherrill@OARcorp.com> * cpu.c: Spacing issues. diff --git a/c/src/exec/score/cpu/arm/Makefile.am b/c/src/exec/score/cpu/arm/Makefile.am index 33835f7620..cb7d92de8c 100644 --- a/c/src/exec/score/cpu/arm/Makefile.am +++ b/c/src/exec/score/cpu/arm/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal @@ -20,6 +20,7 @@ REL = $(ARCH)/rtems-cpu.rel rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am $(PROJECT_INCLUDE): @@ -38,7 +39,8 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o -all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES) +all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ + $(TMPINSTALL_FILES) .PRECIOUS: $(REL) diff --git a/c/src/exec/score/cpu/arm/rtems/Makefile.am b/c/src/exec/score/cpu/arm/rtems/Makefile.am index 900930a502..ef7df82af7 100644 --- a/c/src/exec/score/cpu/arm/rtems/Makefile.am +++ b/c/src/exec/score/cpu/arm/rtems/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/exec/score/cpu/arm/rtems/score/Makefile.am b/c/src/exec/score/cpu/arm/rtems/score/Makefile.am index 9798299588..c7a70a5897 100644 --- a/c/src/exec/score/cpu/arm/rtems/score/Makefile.am +++ b/c/src/exec/score/cpu/arm/rtems/score/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -11,9 +11,8 @@ noinst_HEADERS = $(H_FILES) # (OPTIONAL) Add local stuff here using += # -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/rtems/score \ -$(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ + $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) $(PROJECT_INCLUDE)/rtems/score: $(mkinstalldirs) $@ |