diff options
233 files changed, 811 insertions, 908 deletions
diff --git a/c/src/lib/libcpu/powerpc/mpc821/Makefile.am b/c/src/lib/libcpu/powerpc/mpc821/Makefile.am index f5b09cdd4a..a5679c9061 100644 --- a/c/src/lib/libcpu/powerpc/mpc821/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc821/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/mpc821/clock/Makefile.am b/c/src/lib/libcpu/powerpc/mpc821/clock/Makefile.am index 425db7b238..8a89adbb28 100644 --- a/c/src/lib/libcpu/powerpc/mpc821/clock/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc821/clock/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/mpc821/console-generic/Makefile.am b/c/src/lib/libcpu/powerpc/mpc821/console-generic/Makefile.am index 9540ece551..223db1f126 100644 --- a/c/src/lib/libcpu/powerpc/mpc821/console-generic/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc821/console-generic/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/mpc821/include/Makefile.am b/c/src/lib/libcpu/powerpc/mpc821/include/Makefile.am index f4b13b10bc..9325e13c02 100644 --- a/c/src/lib/libcpu/powerpc/mpc821/include/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc821/include/Makefile.am @@ -1,15 +1,14 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 H_FILES = console.h mpc821.h noinst_HEADERS = $(H_FILES) -TMPINSTALL_FILES = \ -$(PROJECT_INCLUDE)/mpc821 \ -$(H_FILES:%=$(PROJECT_INCLUDE)/mpc821/%) +TMPINSTALL_FILES += $(PROJECT_INCLUDE)/mpc821 \ + $(H_FILES:%=$(PROJECT_INCLUDE)/mpc821/%) $(PROJECT_INCLUDE)/mpc821: $(mkinstalldirs) $@ @@ -17,6 +16,6 @@ $(PROJECT_INCLUDE)/mpc821: $(PROJECT_INCLUDE)/mpc821/%.h: %.h $(INSTALL_DATA) $< $@ -all: $(TMPINSTALL_FILES) +all: $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/mpc821/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc821/timer/Makefile.am index 5786e2da8e..8158ad03b2 100644 --- a/c/src/lib/libcpu/powerpc/mpc821/timer/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc821/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/mpc821/vectors/Makefile.am b/c/src/lib/libcpu/powerpc/mpc821/vectors/Makefile.am index 0242cacdf8..bf04ee809d 100644 --- a/c/src/lib/libcpu/powerpc/mpc821/vectors/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc821/vectors/Makefile.am @@ -1,12 +1,13 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -## FIXME VPATH = @srcdir@:@srcdir@/../../ppc403/vectors +## FIXME + PGM = ${ARCH}/vectors.rel ## Assembly sources diff --git a/c/src/lib/libcpu/powerpc/mpc860/Makefile.am b/c/src/lib/libcpu/powerpc/mpc860/Makefile.am index f5b09cdd4a..a5679c9061 100644 --- a/c/src/lib/libcpu/powerpc/mpc860/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc860/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.am b/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.am index 425db7b238..8a89adbb28 100644 --- a/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.am b/c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.am index 9540ece551..223db1f126 100644 --- a/c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.am b/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.am index 25c4bc34bb..0ac77f1fe8 100644 --- a/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -9,10 +9,9 @@ MPC860_H_FILES = console.h noinst_HEADERS = $(H_FILES) $(MPC860_H_FILES) -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/mpc860 \ -$(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \ -$(MPC860_H_FILES:%.h=$(PROJECT_INCLUDE)/mpc860/%.h) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc860 \ + $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \ + $(MPC860_H_FILES:%.h=$(PROJECT_INCLUDE)/mpc860/%.h) $(PROJECT_INCLUDE)/mpc860: $(mkinstalldirs) $@ @@ -23,6 +22,6 @@ $(PROJECT_INCLUDE)/%.h: %.h $(PROJECT_INCLUDE)/mpc860/%.h: %.h $(INSTALL_DATA) $< $@ -all: $(PREINSTALL_FILES) +all: $(PREINSTALL_FILES) include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.am index 5786e2da8e..8158ad03b2 100644 --- a/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/mpc860/vectors/Makefile.am b/c/src/lib/libcpu/powerpc/mpc860/vectors/Makefile.am index 0242cacdf8..bf04ee809d 100644 --- a/c/src/lib/libcpu/powerpc/mpc860/vectors/Makefile.am +++ b/c/src/lib/libcpu/powerpc/mpc860/vectors/Makefile.am @@ -1,12 +1,13 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -## FIXME VPATH = @srcdir@:@srcdir@/../../ppc403/vectors +## FIXME + PGM = ${ARCH}/vectors.rel ## Assembly sources diff --git a/c/src/lib/libcpu/powerpc/ppc403/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/Makefile.am index 78d893c980..bd55ab2ed0 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/Makefile.am +++ b/c/src/lib/libcpu/powerpc/ppc403/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am index 425db7b238..8a89adbb28 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am +++ b/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am index 26170bb1bc..73ea97047c 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am +++ b/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am index 357dc3b888..e243f1196f 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am +++ b/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am index 5786e2da8e..8158ad03b2 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am +++ b/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am index d4363b1568..2b35c62cd5 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am +++ b/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/shared/Makefile.am b/c/src/lib/libcpu/powerpc/shared/Makefile.am index 29c8a7fc01..0e7c764d18 100644 --- a/c/src/lib/libcpu/powerpc/shared/Makefile.am +++ b/c/src/lib/libcpu/powerpc/shared/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/powerpc/wrapup/Makefile.am b/c/src/lib/libcpu/powerpc/wrapup/Makefile.am index afd80f09ae..e0b03be1d3 100644 --- a/c/src/lib/libcpu/powerpc/wrapup/Makefile.am +++ b/c/src/lib/libcpu/powerpc/wrapup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -9,8 +9,8 @@ GENERIC_FILES = shared # Use two variables so that I can make two ar command. # So far FAMILY_OBJS is empty and ar dislike it... CPU_SPECIFIC_OBJS = $(wildcard ../$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.o) -FAMILY_OBJS = $(wildcard ../shared/$(ARCH)/*.o ../shared/*/$(ARCH)/*.o \ - ../mpc6xx/*/$(ARCH)/*.o) +FAMILY_OBJS = \ + $(wildcard ../shared/$(ARCH)/*.o ../shared/*/$(ARCH)/*.o ../mpc6xx/*/$(ARCH)/*.o) LIB = $(ARCH)/libcpu.a diff --git a/c/src/lib/libcpu/sh/Makefile.am b/c/src/lib/libcpu/sh/Makefile.am index f904c56993..8de599ce50 100644 --- a/c/src/lib/libcpu/sh/Makefile.am +++ b/c/src/lib/libcpu/sh/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal diff --git a/c/src/lib/libcpu/sh/sh7032/Makefile.am b/c/src/lib/libcpu/sh/sh7032/Makefile.am index 4817b67a71..ad159e941c 100644 --- a/c/src/lib/libcpu/sh/sh7032/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7032/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/sh/sh7032/clock/Makefile.am b/c/src/lib/libcpu/sh/sh7032/clock/Makefile.am index c24fdd3160..9a387ee926 100644 --- a/c/src/lib/libcpu/sh/sh7032/clock/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7032/clock/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/sh/sh7032/delay/Makefile.am b/c/src/lib/libcpu/sh/sh7032/delay/Makefile.am index 5d34184b44..1962ece592 100644 --- a/c/src/lib/libcpu/sh/sh7032/delay/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7032/delay/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/sh/sh7032/include/Makefile.am b/c/src/lib/libcpu/sh/sh7032/include/Makefile.am index 68e10faeeb..4a169232a5 100644 --- a/c/src/lib/libcpu/sh/sh7032/include/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7032/include/Makefile.am @@ -1,12 +1,12 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 H_FILES = null.h sci.h sh7_pfc.h sh7_sci.h -# NOTE: Unlike other CPUS, we install into a subdirectory to avoid +# NOTE: Unlike other CPUS, we install into a subdirectory to avoid # file name conflicts $(PROJECT_INCLUDE)/sh: diff --git a/c/src/lib/libcpu/sh/sh7032/null/Makefile.am b/c/src/lib/libcpu/sh/sh7032/null/Makefile.am index d96cfdbb55..c0c7369387 100644 --- a/c/src/lib/libcpu/sh/sh7032/null/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7032/null/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/sh/sh7032/sci/Makefile.am b/c/src/lib/libcpu/sh/sh7032/sci/Makefile.am index 51e7ed8d60..840f2e8567 100644 --- a/c/src/lib/libcpu/sh/sh7032/sci/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7032/sci/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/sh/sh7032/timer/Makefile.am b/c/src/lib/libcpu/sh/sh7032/timer/Makefile.am index c05302c9a8..41dacf22cb 100644 --- a/c/src/lib/libcpu/sh/sh7032/timer/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7032/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/sh/sh7045/Makefile.am b/c/src/lib/libcpu/sh/sh7045/Makefile.am index 77c3665b87..5452a07131 100644 --- a/c/src/lib/libcpu/sh/sh7045/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am b/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am index c24fdd3160..9a387ee926 100644 --- a/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/sh/sh7045/include/Makefile.am b/c/src/lib/libcpu/sh/sh7045/include/Makefile.am index 4742cbcc86..1323efd364 100644 --- a/c/src/lib/libcpu/sh/sh7045/include/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/include/Makefile.am @@ -1,12 +1,12 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 H_FILES = io_types.h null.h sci.h sh7_pfc.h sh7_sci.h -# NOTE: Unlike other CPUS, we install into a subdirectory to avoid +# NOTE: Unlike other CPUS, we install into a subdirectory to avoid # file name conflicts $(PROJECT_INCLUDE)/sh: diff --git a/c/src/lib/libcpu/sh/sh7045/null/Makefile.am b/c/src/lib/libcpu/sh/sh7045/null/Makefile.am index d96cfdbb55..c0c7369387 100644 --- a/c/src/lib/libcpu/sh/sh7045/null/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/null/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am b/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am index 51e7ed8d60..840f2e8567 100644 --- a/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am b/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am index c05302c9a8..41dacf22cb 100644 --- a/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/sparc/Makefile.am b/c/src/lib/libcpu/sparc/Makefile.am index 4c5ead3d5f..d89863901e 100644 --- a/c/src/lib/libcpu/sparc/Makefile.am +++ b/c/src/lib/libcpu/sparc/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal diff --git a/c/src/lib/libcpu/sparc/reg_win/Makefile.am b/c/src/lib/libcpu/sparc/reg_win/Makefile.am index b5d6c3df76..79e504d0b6 100644 --- a/c/src/lib/libcpu/sparc/reg_win/Makefile.am +++ b/c/src/lib/libcpu/sparc/reg_win/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/sparc/syscall/Makefile.am b/c/src/lib/libcpu/sparc/syscall/Makefile.am index aaf3c68909..c3ca3a1092 100644 --- a/c/src/lib/libcpu/sparc/syscall/Makefile.am +++ b/c/src/lib/libcpu/sparc/syscall/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/libchip/network/Makefile.am b/c/src/libchip/network/Makefile.am index 4b606809a4..f1052a05dc 100644 --- a/c/src/libchip/network/Makefile.am +++ b/c/src/libchip/network/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/libchip/rtc/Makefile.am b/c/src/libchip/rtc/Makefile.am index c2ec59470d..23609fd91b 100644 --- a/c/src/libchip/rtc/Makefile.am +++ b/c/src/libchip/rtc/Makefile.am @@ -8,7 +8,8 @@ LIBNAME = librtcio LIB = ${ARCH}/${LIBNAME}.a C_FILES = rtcprobe.c icm7170.c icm7170_reg.c icm7170_reg2.c icm7170_reg4.c \ - icm7170_reg8.c m48t08.c m48t08_reg.c m48t08_reg2.c m48t08_reg4.c m48t08_reg8.c + icm7170_reg8.c m48t08.c m48t08_reg.c m48t08_reg2.c m48t08_reg4.c \ + m48t08_reg8.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) @@ -20,12 +21,10 @@ OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../automake/lib.am -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/libchip \ -$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip \ + $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%) -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a $(PROJECT_INCLUDE)/libchip: @$(mkinstalldirs) $@ @@ -46,8 +45,7 @@ $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES) -DOC_FILES = \ -README.ds1643 README.icm7170 README.m48t08 README.m48t18 STATUS +DOC_FILES = README.ds1643 README.icm7170 README.m48t08 README.m48t18 STATUS EXTRA_DIST = $(C_FILES) $(DOC_FILES) diff --git a/c/src/libchip/serial/Makefile.am b/c/src/libchip/serial/Makefile.am index 3e860df828..2aff521883 100644 --- a/c/src/libchip/serial/Makefile.am +++ b/c/src/libchip/serial/Makefile.am @@ -8,8 +8,8 @@ LIBNAME = libserialio LIB = ${ARCH}/${LIBNAME}.a C_FILES = mc68681.c mc68681_baud.c mc68681_reg.c mc68681_reg2.c \ - mc68681_reg4.c mc68681_reg8.c ns16550.c z85c30.c z85c30_reg.c \ - serprobe.c termios_baud2index.c termios_baud2num.c + mc68681_reg4.c mc68681_reg8.c ns16550.c z85c30.c z85c30_reg.c serprobe.c \ + termios_baud2index.c termios_baud2num.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = mc68681_p.h ns16550_p.h sersupp.h z85c30_p.h @@ -21,12 +21,10 @@ OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../automake/lib.am -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/libchip \ -$(INSTALLED_H_FILES:%=$(PROJECT_INCLUDE)/libchip/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip \ + $(INSTALLED_H_FILES:%=$(PROJECT_INCLUDE)/libchip/%) -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a $(PROJECT_INCLUDE)/libchip: @$(mkinstalldirs) $@ @@ -47,8 +45,8 @@ $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES) -DOC_FILES = \ -README.mc68681 README.ns16550 README.xr88681 README.z85c30 STATUS +DOC_FILES = README.mc68681 README.ns16550 README.xr88681 README.z85c30 \ + STATUS EXTRA_DIST = $(C_FILES) $(DOC_FILES) diff --git a/c/src/libmisc/cpuuse/Makefile.am b/c/src/libmisc/cpuuse/Makefile.am index 19b08eaed7..8ec7bade32 100644 --- a/c/src/libmisc/cpuuse/Makefile.am +++ b/c/src/libmisc/cpuuse/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/libmisc/dummy/Makefile.am b/c/src/libmisc/dummy/Makefile.am index 69a84e88e1..8eafa6767c 100644 --- a/c/src/libmisc/dummy/Makefile.am +++ b/c/src/libmisc/dummy/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/libmisc/dumpbuf/Makefile.am b/c/src/libmisc/dumpbuf/Makefile.am index 4c60d4f019..335d8eb4db 100644 --- a/c/src/libmisc/dumpbuf/Makefile.am +++ b/c/src/libmisc/dumpbuf/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/libmisc/monitor/Makefile.am b/c/src/libmisc/monitor/Makefile.am index 0218bc9423..80952c1f89 100644 --- a/c/src/libmisc/monitor/Makefile.am +++ b/c/src/libmisc/monitor/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/libmisc/rtmonuse/Makefile.am b/c/src/libmisc/rtmonuse/Makefile.am index 190107657c..cb163cc8e0 100644 --- a/c/src/libmisc/rtmonuse/Makefile.am +++ b/c/src/libmisc/rtmonuse/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/libmisc/stackchk/Makefile.am b/c/src/libmisc/stackchk/Makefile.am index 81d1659f2a..353ea24684 100644 --- a/c/src/libmisc/stackchk/Makefile.am +++ b/c/src/libmisc/stackchk/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/libmisc/untar/Makefile.am b/c/src/libmisc/untar/Makefile.am index 64315ddd11..fba0c8ce0e 100644 --- a/c/src/libmisc/untar/Makefile.am +++ b/c/src/libmisc/untar/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/libmisc/wrapup/Makefile.am b/c/src/libmisc/wrapup/Makefile.am index d86ed352fa..5dc2a3d49e 100644 --- a/c/src/libmisc/wrapup/Makefile.am +++ b/c/src/libmisc/wrapup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/libnetworking/Makefile.am b/c/src/libnetworking/Makefile.am index ce9cf6c399..9b190df3e6 100644 --- a/c/src/libnetworking/Makefile.am +++ b/c/src/libnetworking/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal diff --git a/c/src/libnetworking/include/Makefile.am b/c/src/libnetworking/include/Makefile.am index 2d0b15c14f..2fe080d0dd 100644 --- a/c/src/libnetworking/include/Makefile.am +++ b/c/src/libnetworking/include/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## ## ## FIXME: This Makefile.am is pretty ugly and deserves to be reworked :( ## @@ -192,7 +192,8 @@ $(PROJECT_INCLUDE)/sys/uio.h: ../sys/uio.h $(PROJECT_INCLUDE)/rtems/rtems_bsdnet.h: ../rtems/rtems_bsdnet.h $(INSTALL_DATA) $< $@ -$(PROJECT_INCLUDE)/rtems/rtems_bsdnet_internal.h: ../rtems/rtems_bsdnet_internal.h +$(PROJECT_INCLUDE)/rtems/rtems_bsdnet_internal.h: \ + ../rtems/rtems_bsdnet_internal.h $(INSTALL_DATA) $< $@ $(PROJECT_INCLUDE)/rtems/tftp.h: ../rtems/tftp.h diff --git a/c/src/libnetworking/kern/Makefile.am b/c/src/libnetworking/kern/Makefile.am index 61bc6a5df2..6f754174f0 100644 --- a/c/src/libnetworking/kern/Makefile.am +++ b/c/src/libnetworking/kern/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/libnetworking/lib/Makefile.am b/c/src/libnetworking/lib/Makefile.am index 1b2349aed6..82d5a85a6a 100644 --- a/c/src/libnetworking/lib/Makefile.am +++ b/c/src/libnetworking/lib/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/libnetworking/libc/Makefile.am b/c/src/libnetworking/libc/Makefile.am index 5d498b992e..58a635febb 100644 --- a/c/src/libnetworking/libc/Makefile.am +++ b/c/src/libnetworking/libc/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 no-installman @@ -30,8 +30,7 @@ man_MANS = addr2ascii.3 byteorder.3 ethers.3 gethostbyname.3 getnetent.3 \ # Add local stuff here using += # -AM_CPPFLAGS += -DNOPOLL -DNOSELECT -AM_CPPFLAGS += -U__STRICT_ANSI__ +AM_CPPFLAGS += -DNOPOLL -DNOSELECT -U__STRICT_ANSI__ $(LIB): $(OBJS) $(make-library) diff --git a/c/src/libnetworking/machine/Makefile.am b/c/src/libnetworking/machine/Makefile.am index 11e23bf86c..1afebd3827 100644 --- a/c/src/libnetworking/machine/Makefile.am +++ b/c/src/libnetworking/machine/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/libnetworking/net/Makefile.am b/c/src/libnetworking/net/Makefile.am index 1f99e7d002..5848298438 100644 --- a/c/src/libnetworking/net/Makefile.am +++ b/c/src/libnetworking/net/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/libnetworking/netinet/Makefile.am b/c/src/libnetworking/netinet/Makefile.am index 2c9da3cda2..ec35bc0730 100644 --- a/c/src/libnetworking/netinet/Makefile.am +++ b/c/src/libnetworking/netinet/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/libnetworking/nfs/Makefile.am b/c/src/libnetworking/nfs/Makefile.am index 58b68ab2b9..5cdecde16d 100644 --- a/c/src/libnetworking/nfs/Makefile.am +++ b/c/src/libnetworking/nfs/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/libnetworking/pppd/Makefile.am b/c/src/libnetworking/pppd/Makefile.am index 42b6314670..9006e37473 100644 --- a/c/src/libnetworking/pppd/Makefile.am +++ b/c/src/libnetworking/pppd/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/libnetworking/rtems/Makefile.am b/c/src/libnetworking/rtems/Makefile.am index f8d05e125f..1a8391dd74 100644 --- a/c/src/libnetworking/rtems/Makefile.am +++ b/c/src/libnetworking/rtems/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/libnetworking/rtems_servers/Makefile.am b/c/src/libnetworking/rtems_servers/Makefile.am index 21fabd064f..551c8360f8 100644 --- a/c/src/libnetworking/rtems_servers/Makefile.am +++ b/c/src/libnetworking/rtems_servers/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/libnetworking/rtems_webserver/Makefile.am b/c/src/libnetworking/rtems_webserver/Makefile.am index c069f4e6f5..070f0d1275 100644 --- a/c/src/libnetworking/rtems_webserver/Makefile.am +++ b/c/src/libnetworking/rtems_webserver/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -9,8 +9,7 @@ LIB = $(ARCH)/$(LIBNAME) C_FILES = asp.c balloc.c wbase64.c default.c ejlex.c ejparse.c form.c h.c \ handler.c mime.c misc.c webpage.c ringq.c rom.c security.c socket.c \ - sym.c uemf.c url.c value.c webrom.c webs.c websuemf.c \ - webmain.c + sym.c uemf.c url.c value.c webrom.c webs.c websuemf.c webmain.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) @@ -39,7 +38,7 @@ $(PROJECT_INCLUDE)/goahead/%.h: %.h $(INSTALL_DATA) $< $@ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/goahead \ - $(H_FILES:%.h=$(PROJECT_INCLUDE)/goahead/%.h) + $(H_FILES:%.h=$(PROJECT_INCLUDE)/goahead/%.h) if HAS_POSIX all: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB) diff --git a/c/src/libnetworking/vm/Makefile.am b/c/src/libnetworking/vm/Makefile.am index 3f307c7cfb..e08abfe950 100644 --- a/c/src/libnetworking/vm/Makefile.am +++ b/c/src/libnetworking/vm/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/libnetworking/wrapup/Makefile.am b/c/src/libnetworking/wrapup/Makefile.am index 24d15089d0..362c27de7e 100644 --- a/c/src/libnetworking/wrapup/Makefile.am +++ b/c/src/libnetworking/wrapup/Makefile.am @@ -1,12 +1,12 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 if HAS_POSIX POSIX_PIECES = rtems_webserver -endif +endif NET_O_PIECES = kern lib libc net netinet nfs rtems rtems_servers pppd \ $(POSIX_PIECES) diff --git a/c/src/librdbg/include/rdbg/Makefile.am b/c/src/librdbg/include/rdbg/Makefile.am index d47897ff43..ae593dbd85 100644 --- a/c/src/librdbg/include/rdbg/Makefile.am +++ b/c/src/librdbg/include/rdbg/Makefile.am @@ -9,9 +9,8 @@ H_FILES = rdbg.h servrpc.h noinst_HEADERS = $(H_FILES) -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/rdbg \ -$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg \ + $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%) $(PROJECT_INCLUDE)/rdbg: @$(mkinstalldirs) $@ @@ -20,8 +19,6 @@ $(PROJECT_INCLUDE)/rdbg/%.h: %.h endif all-am: $(PREINSTALL_FILES) -debug-am: $(PREINSTALL_FILES) -profile-am: $(PREINSTALL_FILES) if HAS_RDBG SUBDIRS = $(RTEMS_CPU) diff --git a/c/src/librdbg/include/rdbg/i386/Makefile.am b/c/src/librdbg/include/rdbg/i386/Makefile.am index 22246c94ec..80b39c224f 100644 --- a/c/src/librdbg/include/rdbg/i386/Makefile.am +++ b/c/src/librdbg/include/rdbg/i386/Makefile.am @@ -17,9 +17,8 @@ noinst_HEADERS = $(H_FILES) ##$(PROJECT_INCLUDE)/rdbg/i386/%.h: %.h ## $(INSTALL_DATA) $< $@ -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/rdbg \ -$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg \ + $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%) $(PROJECT_INCLUDE)/rdbg: @$(mkinstalldirs) $@ @@ -27,7 +26,5 @@ $(PROJECT_INCLUDE)/rdbg/%.h: %.h $(INSTALL_DATA) $< $@ all-am: $(PREINSTALL_FILES) -debug-am: $(PREINSTALL_FILES) -profile-am: $(PREINSTALL_FILES) include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/librdbg/include/rdbg/powerpc/Makefile.am b/c/src/librdbg/include/rdbg/powerpc/Makefile.am index b5b502bf3b..8dc5bb2b79 100644 --- a/c/src/librdbg/include/rdbg/powerpc/Makefile.am +++ b/c/src/librdbg/include/rdbg/powerpc/Makefile.am @@ -17,9 +17,8 @@ noinst_HEADERS = $(H_FILES) ##$(PROJECT_INCLUDE)/rdbg/powerpc/%.h: %.h ## $(INSTALL_DATA) $< $@ -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/rdbg \ -$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg \ + $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%) $(PROJECT_INCLUDE)/rdbg: @$(mkinstalldirs) $@ @@ -27,7 +26,5 @@ $(PROJECT_INCLUDE)/rdbg/%.h: %.h $(INSTALL_DATA) $< $@ all-am: $(PREINSTALL_FILES) -debug-am: $(PREINSTALL_FILES) -profile-am: $(PREINSTALL_FILES) include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/librdbg/src/Makefile.am b/c/src/librdbg/src/Makefile.am index 3e41bfc8ad..73809bcc2d 100644 --- a/c/src/librdbg/src/Makefile.am +++ b/c/src/librdbg/src/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/librdbg/src/i386/Makefile.am b/c/src/librdbg/src/i386/Makefile.am index 9fec02b48f..aa85593479 100644 --- a/c/src/librdbg/src/i386/Makefile.am +++ b/c/src/librdbg/src/i386/Makefile.am @@ -6,8 +6,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 SUBDIRS = any -EXTRA_DIST = \ -excep_f.c rdbg_cpu_asm.S rdbg_f.c +EXTRA_DIST = excep_f.c rdbg_cpu_asm.S rdbg_f.c include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/librdbg/src/i386/any/Makefile.am b/c/src/librdbg/src/i386/any/Makefile.am index 7c93d6ad29..70ca62aa5c 100644 --- a/c/src/librdbg/src/i386/any/Makefile.am +++ b/c/src/librdbg/src/i386/any/Makefile.am @@ -79,12 +79,9 @@ $(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h $(PROJECT_INCLUDE)/rdbg: @$(mkinstalldirs) $@ -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/rdbg \ -$(PROJECT_INCLUDE)/rdbg/remdeb.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg $(PROJECT_INCLUDE)/rdbg/remdeb.h -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES) diff --git a/c/src/librdbg/src/powerpc/Makefile.am b/c/src/librdbg/src/powerpc/Makefile.am index 006c0d9867..45b775578d 100644 --- a/c/src/librdbg/src/powerpc/Makefile.am +++ b/c/src/librdbg/src/powerpc/Makefile.am @@ -6,8 +6,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 SUBDIRS = mcp750 -EXTRA_DIST = \ -excep_f.c rdbg_cpu_asm.S rdbg_f.c +EXTRA_DIST = excep_f.c rdbg_cpu_asm.S rdbg_f.c include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/librdbg/src/powerpc/mcp750/Makefile.am b/c/src/librdbg/src/powerpc/mcp750/Makefile.am index e1936b3f51..4707453606 100644 --- a/c/src/librdbg/src/powerpc/mcp750/Makefile.am +++ b/c/src/librdbg/src/powerpc/mcp750/Makefile.am @@ -79,12 +79,9 @@ $(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h $(PROJECT_INCLUDE)/rdbg: @$(mkinstalldirs) $@ -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/rdbg \ -$(PROJECT_INCLUDE)/rdbg/remdeb.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg $(PROJECT_INCLUDE)/rdbg/remdeb.h -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES) diff --git a/c/src/librpc/include/rpc/Makefile.am b/c/src/librpc/include/rpc/Makefile.am index 5ca801b3c9..40fe90dfd3 100644 --- a/c/src/librpc/include/rpc/Makefile.am +++ b/c/src/librpc/include/rpc/Makefile.am @@ -9,9 +9,8 @@ H_FILES = auth.h rpc.h svc.h types.h clnt.h rpc_msg.h svc_auth.h xdr.h noinst_HEADERS = $(H_FILES) if HAS_NETWORKING -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/rpc \ -$(H_FILES:%=$(PROJECT_INCLUDE)/rpc/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc \ + $(H_FILES:%=$(PROJECT_INCLUDE)/rpc/%) $(PROJECT_INCLUDE)/rpc: @$(mkinstalldirs) $@ @@ -20,7 +19,5 @@ $(PROJECT_INCLUDE)/rpc/%.h: %.h endif all-am: $(PREINSTALL_FILES) -debug-am: $(PREINSTALL_FILES) -profile-am: $(PREINSTALL_FILES) include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/librpc/src/Makefile.am b/c/src/librpc/src/Makefile.am index efa6a1cadb..d939189f95 100644 --- a/c/src/librpc/src/Makefile.am +++ b/c/src/librpc/src/Makefile.am @@ -19,8 +19,7 @@ include $(top_srcdir)/../../../automake/lib.am AM_CFLAGS += $(LIBC_DEFINES) -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a $(LIB): ${OBJS} $(make-library) diff --git a/c/src/librtems++/include/rtems++/Makefile.am b/c/src/librtems++/include/rtems++/Makefile.am index 67ace61e70..d64703fe73 100644 --- a/c/src/librtems++/include/rtems++/Makefile.am +++ b/c/src/librtems++/include/rtems++/Makefile.am @@ -5,14 +5,13 @@ AUTOMAKE_OPTIONS = foreign 1.4 if HAS_CXX -H_FILES = rtemsEvent.h rtemsInterrupt.h rtemsMessageQueue.h \ - rtemsSemaphore.h rtemsStatusCode.h rtemsTask.h rtemsTaskMode.h rtemsTimer.h +H_FILES = rtemsEvent.h rtemsInterrupt.h rtemsMessageQueue.h rtemsSemaphore.h \ + rtemsStatusCode.h rtemsTask.h rtemsTaskMode.h rtemsTimer.h noinst_HEADERS = $(H_FILES) -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/rtems++ \ -$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems++/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems++ \ + $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems++/%) $(PROJECT_INCLUDE)/rtems++: @$(mkinstalldirs) $@ @@ -21,7 +20,5 @@ $(PROJECT_INCLUDE)/rtems++/%.h: %.h endif all-am: $(PREINSTALL_FILES) -debug-am: $(PREINSTALL_FILES) -profile-am: $(PREINSTALL_FILES) include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/librtems++/src/Makefile.am b/c/src/librtems++/src/Makefile.am index b4f3d87cca..5b681e69d9 100644 --- a/c/src/librtems++/src/Makefile.am +++ b/c/src/librtems++/src/Makefile.am @@ -8,7 +8,7 @@ LIBNAME = librtems++ LIB = ${ARCH}/${LIBNAME}.a CC_FILES = rtemsEvent.cc rtemsInterrupt.cc rtemsMessageQueue.cc \ - rtemsSemaphore.cc rtemsStatusCode.cc rtemsTask.cc rtemsTimer.cc + rtemsSemaphore.cc rtemsStatusCode.cc rtemsTask.cc rtemsTimer.cc CC_O_FILES = $(CC_FILES:%.cc=${ARCH}/%.o) SRCS = $(CC_FILES) @@ -19,8 +19,7 @@ include $(top_srcdir)/../../../automake/lib.am AM_CFLAGS += $(LIBC_DEFINES) -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a $(LIB): ${OBJS} $(make-library) diff --git a/c/src/make/Makefile.am b/c/src/make/Makefile.am index 413dd83719..e2039085f1 100644 --- a/c/src/make/Makefile.am +++ b/c/src/make/Makefile.am @@ -5,30 +5,22 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -rtems_makedir=$(prefix)/make +rtems_makedir = $(prefix)/make -GENERIC_FILES = \ -host.cfg +GENERIC_FILES = host.cfg -MAKE_FILES = README \ -directory.cfg leaf.cfg \ -lib.cfg +MAKE_FILES = README directory.cfg leaf.cfg lib.cfg -rtems_make_DATA = \ -$(MAKE_FILES) \ -$(GENERIC_FILES) +rtems_make_DATA = $(MAKE_FILES) $(GENERIC_FILES) -noinst_DATA = \ -main.cfg +noinst_DATA = main.cfg rtemsdir = $(prefix) rtems_bspdir = $(rtemsdir)/@RTEMS_BSP@ -rtems_bsp_DATA = \ -Makefile.inc +rtems_bsp_DATA = Makefile.inc rtems_bsp_makedir = $(rtems_bspdir)/make -rtems_bsp_make_DATA = \ -bsp.cfg +rtems_bsp_make_DATA = bsp.cfg if MAINTAINER_MODE $(srcdir)/host.cfg.in: $(top_srcdir)/@RTEMS_TOPdir@/make/host.cfg.in diff --git a/c/src/make/compilers/Makefile.am b/c/src/make/compilers/Makefile.am index d067af45a7..b12aec574d 100644 --- a/c/src/make/compilers/Makefile.am +++ b/c/src/make/compilers/Makefile.am @@ -4,12 +4,11 @@ AUTOMAKE_OPTIONS = foreign 1.4 -rtems_makedir=$(prefix)/make -rtems_make_compilersdir=$(rtems_makedir)/compilers +rtems_makedir = $(prefix)/make +rtems_make_compilersdir = $(rtems_makedir)/compilers ## At the moment all actively supported configurations ## use gcc-target-default.cfg only. -rtems_make_compilers_DATA= \ -gcc-target-default.cfg +rtems_make_compilers_DATA = gcc-target-default.cfg include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/make/custom/Makefile.am b/c/src/make/custom/Makefile.am index 60e10bf712..01c6aba402 100644 --- a/c/src/make/custom/Makefile.am +++ b/c/src/make/custom/Makefile.am @@ -4,11 +4,10 @@ AUTOMAKE_OPTIONS = foreign 1.4 -rtems_makedir=$(prefix)/make -rtems_make_customdir=$(rtems_makedir)/custom +rtems_makedir = $(prefix)/make +rtems_make_customdir = $(rtems_makedir)/custom rtems_make_custom_DATA = @CUSTOM_CFG_FILES@ -noinst_DATA = \ -default.cfg +noinst_DATA = default.cfg include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/tests/itrontests/itronhello/Makefile.am b/c/src/tests/itrontests/itronhello/Makefile.am index a95c1a50fc..212bb712fc 100644 --- a/c/src/tests/itrontests/itronhello/Makefile.am +++ b/c/src/tests/itrontests/itronhello/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = itronhello PGM = ${ARCH}/$(TEST).exe @@ -12,7 +13,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/itrontests/itronmbf01/Makefile.am b/c/src/tests/itrontests/itronmbf01/Makefile.am index f53953f6d2..3637084ca3 100644 --- a/c/src/tests/itrontests/itronmbf01/Makefile.am +++ b/c/src/tests/itrontests/itronmbf01/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = itronmbf01 PGM = ${ARCH}/$(TEST).exe @@ -12,7 +13,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/itrontests/itronmbox01/Makefile.am b/c/src/tests/itrontests/itronmbox01/Makefile.am index d93df4fe39..f393392250 100644 --- a/c/src/tests/itrontests/itronmbox01/Makefile.am +++ b/c/src/tests/itrontests/itronmbox01/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = itronmbox01 PGM = ${ARCH}/$(TEST).exe @@ -12,7 +13,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/itrontests/itronsem01/Makefile.am b/c/src/tests/itrontests/itronsem01/Makefile.am index b379ffe1de..345c9023cb 100644 --- a/c/src/tests/itrontests/itronsem01/Makefile.am +++ b/c/src/tests/itrontests/itronsem01/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = itronsem01 PGM = ${ARCH}/$(TEST).exe @@ -12,7 +13,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/itrontests/itrontask01/Makefile.am b/c/src/tests/itrontests/itrontask01/Makefile.am index 244a1bf760..913ec99d5b 100644 --- a/c/src/tests/itrontests/itrontask01/Makefile.am +++ b/c/src/tests/itrontests/itrontask01/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = itrontask01 PGM = ${ARCH}/$(TEST).exe @@ -12,7 +13,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/itrontests/itrontask02/Makefile.am b/c/src/tests/itrontests/itrontask02/Makefile.am index d424fc088d..139887c0ff 100644 --- a/c/src/tests/itrontests/itrontask02/Makefile.am +++ b/c/src/tests/itrontests/itrontask02/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = itrontask02 PGM = ${ARCH}/$(TEST).exe @@ -12,7 +13,7 @@ C_FILES = init.c dormant.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/itrontests/itrontask03/Makefile.am b/c/src/tests/itrontests/itrontask03/Makefile.am index d98ead2b53..e872408a3b 100644 --- a/c/src/tests/itrontests/itrontask03/Makefile.am +++ b/c/src/tests/itrontests/itrontask03/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = itrontask03 PGM = ${ARCH}/$(TEST).exe @@ -12,7 +13,7 @@ C_FILES = init.c preempt.c task1.c task2.c task3.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/itrontests/itrontask04/Makefile.am b/c/src/tests/itrontests/itrontask04/Makefile.am index a1875a2b43..2ee516caf4 100644 --- a/c/src/tests/itrontests/itrontask04/Makefile.am +++ b/c/src/tests/itrontests/itrontask04/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = itrontask04 PGM = ${ARCH}/$(TEST).exe @@ -12,7 +13,7 @@ C_FILES = init.c task1.c task2.c task3.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/itrontests/itrontime01/Makefile.am b/c/src/tests/itrontests/itrontime01/Makefile.am index 44a1f89020..3c98a5c000 100644 --- a/c/src/tests/itrontests/itrontime01/Makefile.am +++ b/c/src/tests/itrontests/itrontime01/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = itrontime01 PGM = ${ARCH}/$(TEST).exe @@ -12,7 +13,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/libtests/cpuuse/Makefile.am b/c/src/tests/libtests/cpuuse/Makefile.am index 688393fdf4..16efbbc47e 100644 --- a/c/src/tests/libtests/cpuuse/Makefile.am +++ b/c/src/tests/libtests/cpuuse/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = cpuuse MANAGERS = io rate_monotonic @@ -11,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c tswitch.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/libtests/malloctest/Makefile.am b/c/src/tests/libtests/malloctest/Makefile.am index d6600326a5..c63dfb9be1 100644 --- a/c/src/tests/libtests/malloctest/Makefile.am +++ b/c/src/tests/libtests/malloctest/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = malloctest MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/libtests/monitor/Makefile.am b/c/src/tests/libtests/monitor/Makefile.am index c2295f3291..4fdaba9a92 100644 --- a/c/src/tests/libtests/monitor/Makefile.am +++ b/c/src/tests/libtests/monitor/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = monitor MANAGERS = dpmem event io msg mp part region sem signal timer rate_monotonic \ @@ -12,7 +13,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = #$(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/libtests/putenvtest/Makefile.am b/c/src/tests/libtests/putenvtest/Makefile.am index 0f11da9b37..fa43a6944c 100644 --- a/c/src/tests/libtests/putenvtest/Makefile.am +++ b/c/src/tests/libtests/putenvtest/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = putenvtest MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/libtests/rtems++/Makefile.am b/c/src/tests/libtests/rtems++/Makefile.am index 482bd47f81..e9d8008d9e 100644 --- a/c/src/tests/libtests/rtems++/Makefile.am +++ b/c/src/tests/libtests/rtems++/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = rtems++ MANAGERS = event io msg sem signal timer rate_monotonic @@ -11,7 +12,7 @@ CC_FILES = Init.cc Task1.cc Task2.cc Task3.cc CC_O_FILES = $(CC_FILES:%.cc=${ARCH}/%.o) H_FILES = System.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/libtests/rtmonuse/Makefile.am b/c/src/tests/libtests/rtmonuse/Makefile.am index 6c672fc770..839d6ca3b2 100644 --- a/c/src/tests/libtests/rtmonuse/Makefile.am +++ b/c/src/tests/libtests/rtmonuse/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = rtmonuse MANAGERS = io rate_monotonic @@ -11,7 +12,7 @@ C_FILES = init.c getall.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/libtests/stackchk/Makefile.am b/c/src/tests/libtests/stackchk/Makefile.am index 0a4f247074..8e5974288e 100644 --- a/c/src/tests/libtests/stackchk/Makefile.am +++ b/c/src/tests/libtests/stackchk/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = stackchk MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = blow.c init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/libtests/termios/Makefile.am b/c/src/tests/libtests/termios/Makefile.am index e83da13b4c..d2781c5a9f 100644 --- a/c/src/tests/libtests/termios/Makefile.am +++ b/c/src/tests/libtests/termios/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = termios MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/mptests/mp01/node1/Makefile.am b/c/src/tests/mptests/mp01/node1/Makefile.am index 8743fd0032..9815fdb7c7 100644 --- a/c/src/tests/mptests/mp01/node1/Makefile.am +++ b/c/src/tests/mptests/mp01/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp01/node2/Makefile.am b/c/src/tests/mptests/mp01/node2/Makefile.am index b4c2b0e00e..1693a47fe9 100644 --- a/c/src/tests/mptests/mp01/node2/Makefile.am +++ b/c/src/tests/mptests/mp01/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp02/node1/Makefile.am b/c/src/tests/mptests/mp02/node1/Makefile.am index cfbaf9e463..05ba671aac 100644 --- a/c/src/tests/mptests/mp02/node1/Makefile.am +++ b/c/src/tests/mptests/mp02/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp02/node2/Makefile.am b/c/src/tests/mptests/mp02/node2/Makefile.am index 3aec135df5..59321bd7ed 100644 --- a/c/src/tests/mptests/mp02/node2/Makefile.am +++ b/c/src/tests/mptests/mp02/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp03/node1/Makefile.am b/c/src/tests/mptests/mp03/node1/Makefile.am index 814c3a7ca0..b50171b81a 100644 --- a/c/src/tests/mptests/mp03/node1/Makefile.am +++ b/c/src/tests/mptests/mp03/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp03/node2/Makefile.am b/c/src/tests/mptests/mp03/node2/Makefile.am index 7383530a3d..d36fe8c9d1 100644 --- a/c/src/tests/mptests/mp03/node2/Makefile.am +++ b/c/src/tests/mptests/mp03/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp04/node1/Makefile.am b/c/src/tests/mptests/mp04/node1/Makefile.am index 9f2de4f455..754eb41364 100644 --- a/c/src/tests/mptests/mp04/node1/Makefile.am +++ b/c/src/tests/mptests/mp04/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp04/node2/Makefile.am b/c/src/tests/mptests/mp04/node2/Makefile.am index 45b772f28b..323ee31753 100644 --- a/c/src/tests/mptests/mp04/node2/Makefile.am +++ b/c/src/tests/mptests/mp04/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp05/node1/Makefile.am b/c/src/tests/mptests/mp05/node1/Makefile.am index f6cbdf8388..92ca8722a2 100644 --- a/c/src/tests/mptests/mp05/node1/Makefile.am +++ b/c/src/tests/mptests/mp05/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp05/node2/Makefile.am b/c/src/tests/mptests/mp05/node2/Makefile.am index bd5160786b..877c548fd0 100644 --- a/c/src/tests/mptests/mp05/node2/Makefile.am +++ b/c/src/tests/mptests/mp05/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp06/node1/Makefile.am b/c/src/tests/mptests/mp06/node1/Makefile.am index d6b97521e5..19fa95dd08 100644 --- a/c/src/tests/mptests/mp06/node1/Makefile.am +++ b/c/src/tests/mptests/mp06/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp06/node2/Makefile.am b/c/src/tests/mptests/mp06/node2/Makefile.am index a320326816..fcaa71d8ad 100644 --- a/c/src/tests/mptests/mp06/node2/Makefile.am +++ b/c/src/tests/mptests/mp06/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp07/node1/Makefile.am b/c/src/tests/mptests/mp07/node1/Makefile.am index b7feb22bd5..24b42c3949 100644 --- a/c/src/tests/mptests/mp07/node1/Makefile.am +++ b/c/src/tests/mptests/mp07/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp07/node2/Makefile.am b/c/src/tests/mptests/mp07/node2/Makefile.am index 0166b75047..a5a56b582d 100644 --- a/c/src/tests/mptests/mp07/node2/Makefile.am +++ b/c/src/tests/mptests/mp07/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp08/node1/Makefile.am b/c/src/tests/mptests/mp08/node1/Makefile.am index dca04c9ce7..087910c452 100644 --- a/c/src/tests/mptests/mp08/node1/Makefile.am +++ b/c/src/tests/mptests/mp08/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp08/node2/Makefile.am b/c/src/tests/mptests/mp08/node2/Makefile.am index ded0605921..e040cf3a55 100644 --- a/c/src/tests/mptests/mp08/node2/Makefile.am +++ b/c/src/tests/mptests/mp08/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp09/node1/Makefile.am b/c/src/tests/mptests/mp09/node1/Makefile.am index 48fa3cdec4..cce0baf804 100644 --- a/c/src/tests/mptests/mp09/node1/Makefile.am +++ b/c/src/tests/mptests/mp09/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp09/node2/Makefile.am b/c/src/tests/mptests/mp09/node2/Makefile.am index c3601b1f65..6919d4812e 100644 --- a/c/src/tests/mptests/mp09/node2/Makefile.am +++ b/c/src/tests/mptests/mp09/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp10/node1/Makefile.am b/c/src/tests/mptests/mp10/node1/Makefile.am index 13fd03be8d..b606d5a66f 100644 --- a/c/src/tests/mptests/mp10/node1/Makefile.am +++ b/c/src/tests/mptests/mp10/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp10/node2/Makefile.am b/c/src/tests/mptests/mp10/node2/Makefile.am index 36e5937ad1..a0e197c2e1 100644 --- a/c/src/tests/mptests/mp10/node2/Makefile.am +++ b/c/src/tests/mptests/mp10/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp11/node1/Makefile.am b/c/src/tests/mptests/mp11/node1/Makefile.am index ac498e6978..e358f72749 100644 --- a/c/src/tests/mptests/mp11/node1/Makefile.am +++ b/c/src/tests/mptests/mp11/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp11/node2/Makefile.am b/c/src/tests/mptests/mp11/node2/Makefile.am index 903dc2a8b0..a92dc49dd8 100644 --- a/c/src/tests/mptests/mp11/node2/Makefile.am +++ b/c/src/tests/mptests/mp11/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp12/node1/Makefile.am b/c/src/tests/mptests/mp12/node1/Makefile.am index 9073d27d2e..19ca9a3b76 100644 --- a/c/src/tests/mptests/mp12/node1/Makefile.am +++ b/c/src/tests/mptests/mp12/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp12/node2/Makefile.am b/c/src/tests/mptests/mp12/node2/Makefile.am index bb51842bf9..f44b4c307e 100644 --- a/c/src/tests/mptests/mp12/node2/Makefile.am +++ b/c/src/tests/mptests/mp12/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp13/node1/Makefile.am b/c/src/tests/mptests/mp13/node1/Makefile.am index ab8292c486..83acc020ce 100644 --- a/c/src/tests/mptests/mp13/node1/Makefile.am +++ b/c/src/tests/mptests/mp13/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp13/node2/Makefile.am b/c/src/tests/mptests/mp13/node2/Makefile.am index 3c5b6c216f..3a63170acc 100644 --- a/c/src/tests/mptests/mp13/node2/Makefile.am +++ b/c/src/tests/mptests/mp13/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/mptests/mp14/node1/Makefile.am b/c/src/tests/mptests/mp14/node1/Makefile.am index 3adc89c156..1b6f482200 100644 --- a/c/src/tests/mptests/mp14/node1/Makefile.am +++ b/c/src/tests/mptests/mp14/node1/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 1 diff --git a/c/src/tests/mptests/mp14/node2/Makefile.am b/c/src/tests/mptests/mp14/node2/Makefile.am index 8036388726..a48b56c868 100644 --- a/c/src/tests/mptests/mp14/node2/Makefile.am +++ b/c/src/tests/mptests/mp14/node2/Makefile.am @@ -1,9 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 - + VPATH = @srcdir@:@srcdir@/.. NODE = 2 diff --git a/c/src/tests/psxtests/Makefile.am b/c/src/tests/psxtests/Makefile.am index e25e2b2b1a..6ac74865f8 100644 --- a/c/src/tests/psxtests/Makefile.am +++ b/c/src/tests/psxtests/Makefile.am @@ -5,14 +5,14 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -SHARED_DIRS = +SHARED_DIRS = POSIX_DIRS = include psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 \ psx09 psx10 psx11 psx12 psxtime psxtimer psxcancel psxmsgq01 psxsem01 POSIX_FILES_DIRS = psxfile01 psxreaddir psxstat psxmount psx13 -UNUSED_DIRS = +UNUSED_DIRS = SUBDIRS = $(SHARED_DIRS) $(POSIX_DIRS) $(POSIX_FILES_DIRS) $(UNUSED_DIRS) diff --git a/c/src/tests/psxtests/psx01/Makefile.am b/c/src/tests/psxtests/psx01/Makefile.am index 2ad9972bbc..17865b3ab2 100644 --- a/c/src/tests/psxtests/psx01/Makefile.am +++ b/c/src/tests/psxtests/psx01/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx01 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c task.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx02/Makefile.am b/c/src/tests/psxtests/psx02/Makefile.am index 9d3ac6deb7..6bca8569fc 100644 --- a/c/src/tests/psxtests/psx02/Makefile.am +++ b/c/src/tests/psxtests/psx02/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx02 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c task.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx03/Makefile.am b/c/src/tests/psxtests/psx03/Makefile.am index 9acdbc0271..ba30413b14 100644 --- a/c/src/tests/psxtests/psx03/Makefile.am +++ b/c/src/tests/psxtests/psx03/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx03 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c task.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx04/Makefile.am b/c/src/tests/psxtests/psx04/Makefile.am index 807c85e616..8a6db544b0 100644 --- a/c/src/tests/psxtests/psx04/Makefile.am +++ b/c/src/tests/psxtests/psx04/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx04 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx05/Makefile.am b/c/src/tests/psxtests/psx05/Makefile.am index afebdb63aa..b05ee9d1b7 100644 --- a/c/src/tests/psxtests/psx05/Makefile.am +++ b/c/src/tests/psxtests/psx05/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx05 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c task.c task2.c task3.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx06/Makefile.am b/c/src/tests/psxtests/psx06/Makefile.am index 6bdb5c97d9..e600b9d123 100644 --- a/c/src/tests/psxtests/psx06/Makefile.am +++ b/c/src/tests/psxtests/psx06/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx06 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c task.c task2.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx07/Makefile.am b/c/src/tests/psxtests/psx07/Makefile.am index fbcdf1addc..74a7f56680 100644 --- a/c/src/tests/psxtests/psx07/Makefile.am +++ b/c/src/tests/psxtests/psx07/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx07 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c task.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx08/Makefile.am b/c/src/tests/psxtests/psx08/Makefile.am index 8a8ecf8bff..78685afe33 100644 --- a/c/src/tests/psxtests/psx08/Makefile.am +++ b/c/src/tests/psxtests/psx08/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx08 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx09/Makefile.am b/c/src/tests/psxtests/psx09/Makefile.am index 6021389d16..d5f65633b9 100644 --- a/c/src/tests/psxtests/psx09/Makefile.am +++ b/c/src/tests/psxtests/psx09/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx09 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx10/Makefile.am b/c/src/tests/psxtests/psx10/Makefile.am index 92c679669b..869f27d774 100644 --- a/c/src/tests/psxtests/psx10/Makefile.am +++ b/c/src/tests/psxtests/psx10/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx10 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c task.c task2.c task3.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx11/Makefile.am b/c/src/tests/psxtests/psx11/Makefile.am index 7a2c6449a0..dc237a8b83 100644 --- a/c/src/tests/psxtests/psx11/Makefile.am +++ b/c/src/tests/psxtests/psx11/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx11 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c task.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx12/Makefile.am b/c/src/tests/psxtests/psx12/Makefile.am index 8ef5228ee4..32e1fc612b 100644 --- a/c/src/tests/psxtests/psx12/Makefile.am +++ b/c/src/tests/psxtests/psx12/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx12 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c task.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psx13/Makefile.am b/c/src/tests/psxtests/psx13/Makefile.am index cabd1e4a19..4fd85e6af4 100644 --- a/c/src/tests/psxtests/psx13/Makefile.am +++ b/c/src/tests/psxtests/psx13/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psx13 MANAGERS = all diff --git a/c/src/tests/psxtests/psxcancel/Makefile.am b/c/src/tests/psxtests/psxcancel/Makefile.am index 83b3113e31..4c24ba8a1d 100644 --- a/c/src/tests/psxtests/psxcancel/Makefile.am +++ b/c/src/tests/psxtests/psxcancel/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psxcancel MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psxfile01/Makefile.am b/c/src/tests/psxtests/psxfile01/Makefile.am index a042cc60ef..71fe3ef516 100644 --- a/c/src/tests/psxtests/psxfile01/Makefile.am +++ b/c/src/tests/psxtests/psxfile01/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/tests/psxtests/psxhdrs/Makefile.am b/c/src/tests/psxtests/psxhdrs/Makefile.am index 2015c3561e..fa0246b746 100644 --- a/c/src/tests/psxtests/psxhdrs/Makefile.am +++ b/c/src/tests/psxtests/psxhdrs/Makefile.am @@ -1,29 +1,30 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -C_FILES = clock01.c clock02.c clock03.c clock04.c clock05.c clock06.c cond01.c \ - cond02.c cond03.c cond04.c cond05.c cond06.c cond07.c cond08.c cond09.c \ - cond10.c key01.c key02.c key03.c key04.c mutex01.c mutex02.c mutex03.c \ - mutex04.c mutex05.c mutex06.c mutex07.c mutex08.c mutex09.c mutex10.c \ - mutex11.c mutex12.c mutex13.c mutex14.c mutex15.c mutex16.c pthread01.c \ - pthread02.c pthread03.c pthread04.c pthread05.c pthread06.c pthread07.c \ - pthread08.c pthread09.c pthread10.c pthread11.c pthread12.c pthread13.c \ - pthread14.c pthread15.c pthread16.c pthread17.c pthread18.c pthread19.c \ - pthread20.c pthread21.c pthread22.c pthread23.c pthread24.c pthread25.c \ - pthread26.c pthread27.c pthread28.c pthread29.c pthread30.c pthread31.c \ - pthread32.c pthread33.c pthread34.c pthread35.c pthread36.c proc01.c \ - proc02.c proc03.c proc04.c proc05.c proc06.c proc07.c proc08.c proc09.c \ - proc10.c proc11.c proc12.c proc13.c proc14.c sched01.c sched02.c \ - sched03.c sched04.c sched05.c sched06.c sched07.c sched08.c signal01.c \ - signal02.c signal03.c signal04.c signal05.c signal06.c signal07.c \ - signal08.c signal09.c signal10.c signal11.c signal12.c signal13.c \ - signal14.c signal15.c signal16.c signal17.c signal18.c signal19.c \ - signal20.c signal21.c signal22.c time01.c time02.c time03.c time04.c \ - time05.c time06.c time07.c time08.c time09.c time10.c time11.c time12.c \ - time13.c timer01.c timer02.c timer03.c timer04.c timer05.c timer06.c +C_FILES = clock01.c clock02.c clock03.c clock04.c clock05.c clock06.c \ + cond01.c cond02.c cond03.c cond04.c cond05.c cond06.c cond07.c cond08.c \ + cond09.c cond10.c key01.c key02.c key03.c key04.c mutex01.c mutex02.c \ + mutex03.c mutex04.c mutex05.c mutex06.c mutex07.c mutex08.c mutex09.c \ + mutex10.c mutex11.c mutex12.c mutex13.c mutex14.c mutex15.c mutex16.c \ + pthread01.c pthread02.c pthread03.c pthread04.c pthread05.c pthread06.c \ + pthread07.c pthread08.c pthread09.c pthread10.c pthread11.c pthread12.c \ + pthread13.c pthread14.c pthread15.c pthread16.c pthread17.c pthread18.c \ + pthread19.c pthread20.c pthread21.c pthread22.c pthread23.c pthread24.c \ + pthread25.c pthread26.c pthread27.c pthread28.c pthread29.c pthread30.c \ + pthread31.c pthread32.c pthread33.c pthread34.c pthread35.c pthread36.c \ + proc01.c proc02.c proc03.c proc04.c proc05.c proc06.c proc07.c proc08.c \ + proc09.c proc10.c proc11.c proc12.c proc13.c proc14.c sched01.c \ + sched02.c sched03.c sched04.c sched05.c sched06.c sched07.c sched08.c \ + signal01.c signal02.c signal03.c signal04.c signal05.c signal06.c \ + signal07.c signal08.c signal09.c signal10.c signal11.c signal12.c \ + signal13.c signal14.c signal15.c signal16.c signal17.c signal18.c \ + signal19.c signal20.c signal21.c signal22.c time01.c time02.c time03.c \ + time04.c time05.c time06.c time07.c time08.c time09.c time10.c time11.c \ + time12.c time13.c timer01.c timer02.c timer03.c timer04.c timer05.c \ + timer06.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) SRCS = $(C_FILES) diff --git a/c/src/tests/psxtests/psxmount/Makefile.am b/c/src/tests/psxtests/psxmount/Makefile.am index 8bd8fa8601..ae75fd2fb7 100644 --- a/c/src/tests/psxtests/psxmount/Makefile.am +++ b/c/src/tests/psxtests/psxmount/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psxmount MANAGERS = all diff --git a/c/src/tests/psxtests/psxmsgq01/Makefile.am b/c/src/tests/psxtests/psxmsgq01/Makefile.am index c4e16d425a..97ffdfb83b 100644 --- a/c/src/tests/psxtests/psxmsgq01/Makefile.am +++ b/c/src/tests/psxtests/psxmsgq01/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psxmsgq01 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psxreaddir/Makefile.am b/c/src/tests/psxtests/psxreaddir/Makefile.am index 330a0b632b..c9c4393c25 100644 --- a/c/src/tests/psxtests/psxreaddir/Makefile.am +++ b/c/src/tests/psxtests/psxreaddir/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psxreaddir MANAGERS = all diff --git a/c/src/tests/psxtests/psxsem01/Makefile.am b/c/src/tests/psxtests/psxsem01/Makefile.am index 9b48d66b77..2d8a55b903 100644 --- a/c/src/tests/psxtests/psxsem01/Makefile.am +++ b/c/src/tests/psxtests/psxsem01/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psxsem01 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/psxtests/psxstat/Makefile.am b/c/src/tests/psxtests/psxstat/Makefile.am index 7eab4ba7df..19994beb62 100644 --- a/c/src/tests/psxtests/psxstat/Makefile.am +++ b/c/src/tests/psxtests/psxstat/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psxstat MANAGERS = all diff --git a/c/src/tests/psxtests/psxtime/Makefile.am b/c/src/tests/psxtests/psxtime/Makefile.am index 8d8594a332..18b49e3232 100644 --- a/c/src/tests/psxtests/psxtime/Makefile.am +++ b/c/src/tests/psxtests/psxtime/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psxtime MANAGERS = all diff --git a/c/src/tests/psxtests/psxtimer/Makefile.am b/c/src/tests/psxtests/psxtimer/Makefile.am index 1d03c664f7..b2b00d41bb 100644 --- a/c/src/tests/psxtests/psxtimer/Makefile.am +++ b/c/src/tests/psxtests/psxtimer/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = psxtimer MANAGERS = all diff --git a/c/src/tests/samples/Makefile.am b/c/src/tests/samples/Makefile.am index e8c84121ac..04c3059990 100644 --- a/c/src/tests/samples/Makefile.am +++ b/c/src/tests/samples/Makefile.am @@ -15,8 +15,7 @@ FP_TESTS = paranoia SUBDIRS = hello ticker base_sp unlimited minimum $(MP_TESTS) \ $(CPLUSPLUS_TESTS) $(FP_TESTS) -AUTOMAKE_FILES = \ -sample.am +AUTOMAKE_FILES = sample.am EXTRA_DIST = $(AUTOMAKE_FILES) diff --git a/c/src/tests/sptests/sp01/Makefile.am b/c/src/tests/sptests/sp01/Makefile.am index b8ce8b44c0..e081ee94e5 100644 --- a/c/src/tests/sptests/sp01/Makefile.am +++ b/c/src/tests/sptests/sp01/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp02/Makefile.am b/c/src/tests/sptests/sp02/Makefile.am index cd29fa48d9..10cca3c4cd 100644 --- a/c/src/tests/sptests/sp02/Makefile.am +++ b/c/src/tests/sptests/sp02/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c preempt.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp03/Makefile.am b/c/src/tests/sptests/sp03/Makefile.am index f01e6a940a..7e40f8d0c8 100644 --- a/c/src/tests/sptests/sp03/Makefile.am +++ b/c/src/tests/sptests/sp03/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp04/Makefile.am b/c/src/tests/sptests/sp04/Makefile.am index 8431b31282..d5b6799822 100644 --- a/c/src/tests/sptests/sp04/Makefile.am +++ b/c/src/tests/sptests/sp04/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c tswitch.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp05/Makefile.am b/c/src/tests/sptests/sp05/Makefile.am index 15e8b4fce8..2f07356307 100644 --- a/c/src/tests/sptests/sp05/Makefile.am +++ b/c/src/tests/sptests/sp05/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp06/Makefile.am b/c/src/tests/sptests/sp06/Makefile.am index 905f2046c1..8887847628 100644 --- a/c/src/tests/sptests/sp06/Makefile.am +++ b/c/src/tests/sptests/sp06/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp07/Makefile.am b/c/src/tests/sptests/sp07/Makefile.am index 4dee952b4e..9d62ddccf6 100644 --- a/c/src/tests/sptests/sp07/Makefile.am +++ b/c/src/tests/sptests/sp07/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -13,7 +13,7 @@ C_FILES = init.c task1.c task2.c task3.c task4.c taskexit.c tcreate.c \ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp08/Makefile.am b/c/src/tests/sptests/sp08/Makefile.am index 5ac1ef81cf..94e5397c45 100644 --- a/c/src/tests/sptests/sp08/Makefile.am +++ b/c/src/tests/sptests/sp08/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp09/Makefile.am b/c/src/tests/sptests/sp09/Makefile.am index 7433944ffe..ff0d17f6be 100644 --- a/c/src/tests/sptests/sp09/Makefile.am +++ b/c/src/tests/sptests/sp09/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -16,7 +16,7 @@ C_FILES = init.c delay.c isr.c screen01.c screen02.c screen03.c screen04.c \ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp11/Makefile.am b/c/src/tests/sptests/sp11/Makefile.am index d60a1ad6c5..7b9fc29772 100644 --- a/c/src/tests/sptests/sp11/Makefile.am +++ b/c/src/tests/sptests/sp11/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c timer.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp12/Makefile.am b/c/src/tests/sptests/sp12/Makefile.am index a0d69c2fb5..aea068a253 100644 --- a/c/src/tests/sptests/sp12/Makefile.am +++ b/c/src/tests/sptests/sp12/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c task4.c task5.c pridrv.c pritask.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp13/Makefile.am b/c/src/tests/sptests/sp13/Makefile.am index 04033b4ca0..316622d147 100644 --- a/c/src/tests/sptests/sp13/Makefile.am +++ b/c/src/tests/sptests/sp13/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c fillbuff.c putbuff.c task1.c task2.c task3.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp14/Makefile.am b/c/src/tests/sptests/sp14/Makefile.am index a6cafc1528..4ebd302681 100644 --- a/c/src/tests/sptests/sp14/Makefile.am +++ b/c/src/tests/sptests/sp14/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c asr.c task1.c task2.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp15/Makefile.am b/c/src/tests/sptests/sp15/Makefile.am index 76b03d6c17..6e927b30d1 100644 --- a/c/src/tests/sptests/sp15/Makefile.am +++ b/c/src/tests/sptests/sp15/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp16/Makefile.am b/c/src/tests/sptests/sp16/Makefile.am index 9ddee003f3..ce8d2699d5 100644 --- a/c/src/tests/sptests/sp16/Makefile.am +++ b/c/src/tests/sptests/sp16/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c task2.c task3.c task4.c task5.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp17/Makefile.am b/c/src/tests/sptests/sp17/Makefile.am index b5ef4f7bfc..7f04dda8d1 100644 --- a/c/src/tests/sptests/sp17/Makefile.am +++ b/c/src/tests/sptests/sp17/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c asr.c task1.c task2.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp19/Makefile.am b/c/src/tests/sptests/sp19/Makefile.am index cf955cb5c0..79adefab5d 100644 --- a/c/src/tests/sptests/sp19/Makefile.am +++ b/c/src/tests/sptests/sp19/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c first.c fptask.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h fptest.h inttest.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp20/Makefile.am b/c/src/tests/sptests/sp20/Makefile.am index 71275f3854..05422859fc 100644 --- a/c/src/tests/sptests/sp20/Makefile.am +++ b/c/src/tests/sptests/sp20/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c getall.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp21/Makefile.am b/c/src/tests/sptests/sp21/Makefile.am index 0c74850420..0d75adb422 100644 --- a/c/src/tests/sptests/sp21/Makefile.am +++ b/c/src/tests/sptests/sp21/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp22/Makefile.am b/c/src/tests/sptests/sp22/Makefile.am index a3c0c2a801..49d997ede5 100644 --- a/c/src/tests/sptests/sp22/Makefile.am +++ b/c/src/tests/sptests/sp22/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c prtime.c delay.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp23/Makefile.am b/c/src/tests/sptests/sp23/Makefile.am index ada64e3e05..35547a00d1 100644 --- a/c/src/tests/sptests/sp23/Makefile.am +++ b/c/src/tests/sptests/sp23/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp24/Makefile.am b/c/src/tests/sptests/sp24/Makefile.am index 31cb3d122d..600367dd29 100644 --- a/c/src/tests/sptests/sp24/Makefile.am +++ b/c/src/tests/sptests/sp24/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c resume.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp25/Makefile.am b/c/src/tests/sptests/sp25/Makefile.am index 36e252e973..8e49417a8d 100644 --- a/c/src/tests/sptests/sp25/Makefile.am +++ b/c/src/tests/sptests/sp25/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp26/Makefile.am b/c/src/tests/sptests/sp26/Makefile.am index c38df2d90e..c69094f20c 100644 --- a/c/src/tests/sptests/sp26/Makefile.am +++ b/c/src/tests/sptests/sp26/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/sp27/Makefile.am b/c/src/tests/sptests/sp27/Makefile.am index aa204fa7f9..56003e9eaa 100644 --- a/c/src/tests/sptests/sp27/Makefile.am +++ b/c/src/tests/sptests/sp27/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/tests/sptests/sp28/Makefile.am b/c/src/tests/sptests/sp28/Makefile.am index 9f54eb8b5c..edf2904bcf 100644 --- a/c/src/tests/sptests/sp28/Makefile.am +++ b/c/src/tests/sptests/sp28/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/tests/sptests/sp29/Makefile.am b/c/src/tests/sptests/sp29/Makefile.am index fe5f868ad7..dd04832480 100644 --- a/c/src/tests/sptests/sp29/Makefile.am +++ b/c/src/tests/sptests/sp29/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/tests/sptests/spfatal/Makefile.am b/c/src/tests/sptests/spfatal/Makefile.am index eeb236e3c5..efdd847816 100644 --- a/c/src/tests/sptests/spfatal/Makefile.am +++ b/c/src/tests/sptests/spfatal/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c puterr.c fatal.c task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/sptests/spsize/Makefile.am b/c/src/tests/sptests/spsize/Makefile.am index e57071de87..146ce05a21 100644 --- a/c/src/tests/sptests/spsize/Makefile.am +++ b/c/src/tests/sptests/spsize/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,7 +12,7 @@ C_FILES = init.c getint.c size.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/support/include/Makefile.am b/c/src/tests/support/include/Makefile.am index 5321debc5f..1f996ce7d2 100644 --- a/c/src/tests/support/include/Makefile.am +++ b/c/src/tests/support/include/Makefile.am @@ -4,12 +4,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 -project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@ +project_bspdir = $(PROJECT_ROOT)/@RTEMS_BSP@ noinst_HEADERS = tmacros.h TMPINSTALLFILES = $(project_bspdir)/lib/include \ - $(project_bspdir)/lib/include/tmacros.h + $(project_bspdir)/lib/include/tmacros.h $(project_bspdir)/lib/include: $(mkinstalldirs) $@ diff --git a/c/src/tests/support/stubdr/Makefile.am b/c/src/tests/support/stubdr/Makefile.am index 76e9c66cf2..fb9354747c 100644 --- a/c/src/tests/support/stubdr/Makefile.am +++ b/c/src/tests/support/stubdr/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/tests/support/wrapup/Makefile.am b/c/src/tests/support/wrapup/Makefile.am index 41762e0cb0..87724d5760 100644 --- a/c/src/tests/support/wrapup/Makefile.am +++ b/c/src/tests/support/wrapup/Makefile.am @@ -1,10 +1,10 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -LIBNAME=libtest +LIBNAME = libtest LIB = $(ARCH)/$(LIBNAME).a GENERIC_FILES = stubdr diff --git a/c/src/tests/tmitrontests/tmitronsem01/Makefile.am b/c/src/tests/tmitrontests/tmitronsem01/Makefile.am index 6f9d3a062a..b06407f71c 100644 --- a/c/src/tests/tmitrontests/tmitronsem01/Makefile.am +++ b/c/src/tests/tmitrontests/tmitronsem01/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tmitronsem01 MANAGERS = all @@ -11,7 +12,7 @@ C_FILES = init.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/Makefile.am b/c/src/tests/tmtests/Makefile.am index 57d15492c6..6e9287a926 100644 --- a/c/src/tests/tmtests/Makefile.am +++ b/c/src/tests/tmtests/Makefile.am @@ -5,9 +5,9 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -SUBDIRS = include tmck tmoverhd tm01 tm02 tm03 tm04 tm05 tm06 tm07 tm08 \ - tm09 tm10 tm11 tm12 tm13 tm14 tm15 tm16 tm17 tm18 tm19 tm20 tm21 tm22 \ - tm23 tm24 tm25 tm26 tm27 tm28 tm29 +SUBDIRS = include tmck tmoverhd tm01 tm02 tm03 tm04 tm05 tm06 tm07 tm08 tm09 \ + tm10 tm11 tm12 tm13 tm14 tm15 tm16 tm17 tm18 tm19 tm20 tm21 tm22 tm23 \ + tm24 tm25 tm26 tm27 tm28 tm29 EXTRA_DIST = tmtests.am diff --git a/c/src/tests/tmtests/tm01/Makefile.am b/c/src/tests/tmtests/tm01/Makefile.am index 7dcbb1284b..736a14f96f 100644 --- a/c/src/tests/tmtests/tm01/Makefile.am +++ b/c/src/tests/tmtests/tm01/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm01 MANAGERS = io semaphore @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm02/Makefile.am b/c/src/tests/tmtests/tm02/Makefile.am index f278aaa0d0..241ccc38a4 100644 --- a/c/src/tests/tmtests/tm02/Makefile.am +++ b/c/src/tests/tmtests/tm02/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm02 MANAGERS = io semaphore @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm03/Makefile.am b/c/src/tests/tmtests/tm03/Makefile.am index ab35f9fb62..c37d78b1a4 100644 --- a/c/src/tests/tmtests/tm03/Makefile.am +++ b/c/src/tests/tmtests/tm03/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm03 MANAGERS = io semaphore @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm04/Makefile.am b/c/src/tests/tmtests/tm04/Makefile.am index 941eb662de..e221524a5d 100644 --- a/c/src/tests/tmtests/tm04/Makefile.am +++ b/c/src/tests/tmtests/tm04/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm04 MANAGERS = io semaphore @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm05/Makefile.am b/c/src/tests/tmtests/tm05/Makefile.am index 12289a4064..2986ec4e99 100644 --- a/c/src/tests/tmtests/tm05/Makefile.am +++ b/c/src/tests/tmtests/tm05/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm05 MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm06/Makefile.am b/c/src/tests/tmtests/tm06/Makefile.am index 00db9f0d93..7069aec180 100644 --- a/c/src/tests/tmtests/tm06/Makefile.am +++ b/c/src/tests/tmtests/tm06/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm06 MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm07/Makefile.am b/c/src/tests/tmtests/tm07/Makefile.am index 0042de14e9..23520ab6c4 100644 --- a/c/src/tests/tmtests/tm07/Makefile.am +++ b/c/src/tests/tmtests/tm07/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm07 MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm08/Makefile.am b/c/src/tests/tmtests/tm08/Makefile.am index a08a1edc33..c86bc03e31 100644 --- a/c/src/tests/tmtests/tm08/Makefile.am +++ b/c/src/tests/tmtests/tm08/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm08 MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm09/Makefile.am b/c/src/tests/tmtests/tm09/Makefile.am index cc6a6b1be7..47fce737f4 100644 --- a/c/src/tests/tmtests/tm09/Makefile.am +++ b/c/src/tests/tmtests/tm09/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm09 MANAGERS = io message @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm10/Makefile.am b/c/src/tests/tmtests/tm10/Makefile.am index d9ad5adb90..2c2f2c0211 100644 --- a/c/src/tests/tmtests/tm10/Makefile.am +++ b/c/src/tests/tmtests/tm10/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm10 MANAGERS = io message @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm11/Makefile.am b/c/src/tests/tmtests/tm11/Makefile.am index f5895e59c0..46224d079f 100644 --- a/c/src/tests/tmtests/tm11/Makefile.am +++ b/c/src/tests/tmtests/tm11/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm11 MANAGERS = io message @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm12/Makefile.am b/c/src/tests/tmtests/tm12/Makefile.am index bf3b0c38d2..0d77f39ffe 100644 --- a/c/src/tests/tmtests/tm12/Makefile.am +++ b/c/src/tests/tmtests/tm12/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm12 MANAGERS = io message @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm13/Makefile.am b/c/src/tests/tmtests/tm13/Makefile.am index 6a6e01e851..3b0eab892b 100644 --- a/c/src/tests/tmtests/tm13/Makefile.am +++ b/c/src/tests/tmtests/tm13/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm13 MANAGERS = io message @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm14/Makefile.am b/c/src/tests/tmtests/tm14/Makefile.am index 155314d324..a330ff36b7 100644 --- a/c/src/tests/tmtests/tm14/Makefile.am +++ b/c/src/tests/tmtests/tm14/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm14 MANAGERS = io message @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm15/Makefile.am b/c/src/tests/tmtests/tm15/Makefile.am index 5cf90b81ab..16b6f0bc2d 100644 --- a/c/src/tests/tmtests/tm15/Makefile.am +++ b/c/src/tests/tmtests/tm15/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm15 MANAGERS = io event @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm16/Makefile.am b/c/src/tests/tmtests/tm16/Makefile.am index 315a87f1ed..f1b9983eb8 100644 --- a/c/src/tests/tmtests/tm16/Makefile.am +++ b/c/src/tests/tmtests/tm16/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm16 MANAGERS = io event @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm17/Makefile.am b/c/src/tests/tmtests/tm17/Makefile.am index 2f98d224ad..3eed6dfb66 100644 --- a/c/src/tests/tmtests/tm17/Makefile.am +++ b/c/src/tests/tmtests/tm17/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm17 MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm18/Makefile.am b/c/src/tests/tmtests/tm18/Makefile.am index 796e436dac..2b1610be7e 100644 --- a/c/src/tests/tmtests/tm18/Makefile.am +++ b/c/src/tests/tmtests/tm18/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm18 MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm19/Makefile.am b/c/src/tests/tmtests/tm19/Makefile.am index 0508ddab17..658eaef43a 100644 --- a/c/src/tests/tmtests/tm19/Makefile.am +++ b/c/src/tests/tmtests/tm19/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm19 MANAGERS = io signal @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm20/Makefile.am b/c/src/tests/tmtests/tm20/Makefile.am index 5a8e2d755f..c13fe65706 100644 --- a/c/src/tests/tmtests/tm20/Makefile.am +++ b/c/src/tests/tmtests/tm20/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm20 MANAGERS = io partition region @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm21/Makefile.am b/c/src/tests/tmtests/tm21/Makefile.am index 75dddaaa6b..1faa4f39f6 100644 --- a/c/src/tests/tmtests/tm21/Makefile.am +++ b/c/src/tests/tmtests/tm21/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm21 MANAGERS = io dpmem message partition region semaphore rate_monotonic timer @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm22/Makefile.am b/c/src/tests/tmtests/tm22/Makefile.am index 357a461f9a..ea9d3abc21 100644 --- a/c/src/tests/tmtests/tm22/Makefile.am +++ b/c/src/tests/tmtests/tm22/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm22 MANAGERS = io message @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm23/Makefile.am b/c/src/tests/tmtests/tm23/Makefile.am index 37e9220659..ce074be332 100644 --- a/c/src/tests/tmtests/tm23/Makefile.am +++ b/c/src/tests/tmtests/tm23/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm23 MANAGERS = io event timer @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm24/Makefile.am b/c/src/tests/tmtests/tm24/Makefile.am index 176ab4486c..bdc07694ab 100644 --- a/c/src/tests/tmtests/tm24/Makefile.am +++ b/c/src/tests/tmtests/tm24/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm24 MANAGERS = io message @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm25/Makefile.am b/c/src/tests/tmtests/tm25/Makefile.am index d853b24ee8..501c55f111 100644 --- a/c/src/tests/tmtests/tm25/Makefile.am +++ b/c/src/tests/tmtests/tm25/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm25 MANAGERS = io semaphore @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm26/Makefile.am b/c/src/tests/tmtests/tm26/Makefile.am index ac9892f3b0..c7b624d55c 100644 --- a/c/src/tests/tmtests/tm26/Makefile.am +++ b/c/src/tests/tmtests/tm26/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm26 MANAGERS = io semaphore @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h fptest.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm27/Makefile.am b/c/src/tests/tmtests/tm27/Makefile.am index ef6f974a19..249c56e9ef 100644 --- a/c/src/tests/tmtests/tm27/Makefile.am +++ b/c/src/tests/tmtests/tm27/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm27 MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm28/Makefile.am b/c/src/tests/tmtests/tm28/Makefile.am index ff7638b486..bfe5c027d1 100644 --- a/c/src/tests/tmtests/tm28/Makefile.am +++ b/c/src/tests/tmtests/tm28/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm28 MANAGERS = io dpmem @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tm29/Makefile.am b/c/src/tests/tmtests/tm29/Makefile.am index 72b12bc672..02644a1048 100644 --- a/c/src/tests/tmtests/tm29/Makefile.am +++ b/c/src/tests/tmtests/tm29/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tm29 MANAGERS = io rate_monotonic @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tmck/Makefile.am b/c/src/tests/tmtests/tmck/Makefile.am index e1400ee970..05a6dc9c19 100644 --- a/c/src/tests/tmtests/tmck/Makefile.am +++ b/c/src/tests/tmtests/tmck/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tmck MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = task1.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/tests/tmtests/tmoverhd/Makefile.am b/c/src/tests/tmtests/tmoverhd/Makefile.am index 05e463fe56..597e32414d 100644 --- a/c/src/tests/tmtests/tmoverhd/Makefile.am +++ b/c/src/tests/tmtests/tmoverhd/Makefile.am @@ -1,8 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 + TEST = tmoverhd MANAGERS = io @@ -11,7 +12,7 @@ C_FILES = testtask.c empty.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) H_FILES = system.h dumrtems.h -noinst_HEADERS =$(H_FILES) +noinst_HEADERS = $(H_FILES) DOCTYPES = doc DOCS = $(DOCTYPES:%=$(TEST).%) diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am index 1159228816..2a2c7a9def 100644 --- a/c/src/wrapup/Makefile.am +++ b/c/src/wrapup/Makefile.am @@ -13,9 +13,8 @@ LIBNAME = librtemsall LIB = $(PROJECT_RELEASE)/lib/$(LIBNAME)${LIB_VARIANT}.a if HAS_NETWORKING -LIBNETWORKING = \ - $(PROJECT_RELEASE)/lib/libnetworking$(LIB_VARIANT).a \ - $(PROJECT_RELEASE)/lib/librpc$(LIB_VARIANT).a +LIBNETWORKING = $(PROJECT_RELEASE)/lib/libnetworking$(LIB_VARIANT).a \ + $(PROJECT_RELEASE)/lib/librpc$(LIB_VARIANT).a endif if HAS_RDBG @@ -26,8 +25,7 @@ SRCS = $(wildcard $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a) \ $(PROJECT_RELEASE)/lib/librtems$(LIB_VARIANT).a \ $(wildcard $(PROJECT_RELEASE)/lib/libposix$(LIB_VARIANT).a) \ $(wildcard $(PROJECT_RELEASE)/lib/libitron$(LIB_VARIANT).a) \ - $(LIBNETWORKING) \ - $(LIBRDBG) \ + $(LIBNETWORKING) $(LIBRDBG) \ $(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a) \ $(wildcard $(PROJECT_RELEASE)/lib/librtcio$(LIB_VARIANT).a) \ $(wildcard $(PROJECT_RELEASE)/lib/libserialio$(LIB_VARIANT).a) \ @@ -36,8 +34,7 @@ SRCS = $(wildcard $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a) \ $(PROJECT_RELEASE)/lib/libmisc$(LIB_VARIANT).a \ $(wildcard $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).o) -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/$(LIBNAME)${LIB_VARIANT}.a +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)${LIB_VARIANT}.a all: $(ARCH) $(TMPINSTALL_FILES) diff --git a/make/Makefile.am b/make/Makefile.am index 6f57121002..a6e35ba4a9 100644 --- a/make/Makefile.am +++ b/make/Makefile.am @@ -4,22 +4,13 @@ AUTOMAKE_OPTIONS = foreign 1.4 -rtems_makedir=$(prefix)/make +rtems_makedir = $(prefix)/make -rtems_make_DATA = \ -main.cfg +rtems_make_DATA = main.cfg -EXTRA_DIST = \ -README \ -directory.cfg \ -host.cfg.in \ -leaf.cfg \ -lib.cfg +EXTRA_DIST = README directory.cfg host.cfg.in leaf.cfg lib.cfg -SUBDIRS = \ -Templates \ -custom \ -compilers +SUBDIRS = Templates custom compilers ## ------------------------------------------------------- include $(top_srcdir)/automake/subdirs.am diff --git a/make/Templates/Makefile.am b/make/Templates/Makefile.am index 254060d151..52ee7ff73f 100644 --- a/make/Templates/Makefile.am +++ b/make/Templates/Makefile.am @@ -4,12 +4,9 @@ AUTOMAKE_OPTIONS = foreign 1.4 -rtems_makedir=$(prefix)/make -rtems_make_Templatesdir=$(rtems_makedir)/Templates +rtems_makedir = $(prefix)/make +rtems_make_Templatesdir = $(rtems_makedir)/Templates -rtems_make_Templates_DATA = \ -Makefile.dir \ -Makefile.leaf \ -Makefile.lib +rtems_make_Templates_DATA = Makefile.dir Makefile.leaf Makefile.lib include $(top_srcdir)/automake/host.am diff --git a/make/compilers/Makefile.am b/make/compilers/Makefile.am index 0c97a6b2ef..d4b915b525 100644 --- a/make/compilers/Makefile.am +++ b/make/compilers/Makefile.am @@ -4,10 +4,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 -EXTRA_DIST = \ -gcc-no_bsp.cfg \ -gcc-portsw.cfg \ -gcc-target-default.cfg +EXTRA_DIST = gcc-no_bsp.cfg gcc-portsw.cfg gcc-target-default.cfg ## ------------------------------------------------------- include $(top_srcdir)/automake/host.am diff --git a/make/custom/Makefile.am b/make/custom/Makefile.am index 3987a4c680..ee517664d2 100644 --- a/make/custom/Makefile.am +++ b/make/custom/Makefile.am @@ -4,55 +4,19 @@ AUTOMAKE_OPTIONS = foreign 1.4 -rtems_makedir=$(prefix)/make -rtems_make_customdir=$(rtems_makedir)/custom +rtems_makedir = $(prefix)/make +rtems_make_customdir = $(rtems_makedir)/custom -rtems_make_custom_DATA = \ -default.cfg +rtems_make_custom_DATA = default.cfg -EXTRA_DIST = \ -FreeBSD-posix.cfg \ -HPUX9-posix.cfg \ -Linux-posix.cfg \ -Solaris-posix.cfg \ -bare.cfg \ -cvme961.cfg \ -dmv152.cfg \ -dmv177.cfg \ -efi332.cfg \ -efi68k.cfg \ -erc32.cfg \ -eth_comm.cfg \ -gen68302.cfg \ -gen68340.cfg \ -gen68360.cfg \ -gen68360_040.cfg \ -gensh1.cfg \ -helas403.cfg \ -i386ex.cfg \ -idp.cfg \ -mcp750.cfg \ -mvme136.cfg \ -mvme147.cfg \ -mvme147s.cfg \ -mvme162.cfg \ -mvme162lx.cfg \ -mvme167.cfg \ -mvme2307.cfg \ -no_bsp.cfg \ -ods68302.cfg \ -p4000.cfg \ -p4600.cfg \ -p4650.cfg \ -papyrus.cfg \ -pc386.cfg \ -portsw.cfg \ -posix.cfg \ -ppcn_60x.cfg \ -psim.cfg \ -score603e.cfg \ -simhppa.cfg \ -ts_386ex.cfg +EXTRA_DIST = FreeBSD-posix.cfg HPUX9-posix.cfg Linux-posix.cfg \ + Solaris-posix.cfg bare.cfg cvme961.cfg dmv152.cfg dmv177.cfg efi332.cfg \ + efi68k.cfg erc32.cfg eth_comm.cfg gen68302.cfg gen68340.cfg gen68360.cfg \ + gen68360_040.cfg gensh1.cfg helas403.cfg i386ex.cfg idp.cfg mcp750.cfg \ + mvme136.cfg mvme147.cfg mvme147s.cfg mvme162.cfg mvme162lx.cfg \ + mvme167.cfg mvme2307.cfg no_bsp.cfg ods68302.cfg p4000.cfg p4600.cfg \ + p4650.cfg papyrus.cfg pc386.cfg portsw.cfg posix.cfg ppcn_60x.cfg \ + psim.cfg score603e.cfg simhppa.cfg ts_386ex.cfg ## ------------------------------------------------------- include $(top_srcdir)/automake/host.am diff --git a/scripts-ada/Makefile.am b/scripts-ada/Makefile.am index 40b0dd7700..f321615ef6 100644 --- a/scripts-ada/Makefile.am +++ b/scripts-ada/Makefile.am @@ -2,31 +2,24 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal SUBDIRS = . binutils gnatnewlib gdb -noinst_SCRIPTS = \ -setup \ -buildall \ -mkbinutilspec \ -mkbspspec \ -mkgnatnewlibspec \ -mkgdbspec \ -mkrpms \ -mkspec +noinst_SCRIPTS = setup buildall mkbinutilspec mkbspspec mkgnatnewlibspec \ + mkgdbspec mkrpms mkspec -TEMPLATES = +TEMPLATES = -noinst_DATA = \ -setup.def $(TEMPLATES) +noinst_DATA = setup.def $(TEMPLATES) -EXTRA_DIST = \ -$(noinst_DATA) \ -$(noinst_SCRIPTS) +EXTRA_DIST = $(noinst_DATA) $(noinst_SCRIPTS) CONFIGURE_DEPENDENCIES = setup.cache setup.cache: setup.def cp setup.def $@ DISTCLEANFILES = setup.cache +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/scripts-ada/binutils/Makefile.am b/scripts-ada/binutils/Makefile.am index fb6187f3bf..a2b96e2996 100644 --- a/scripts-ada/binutils/Makefile.am +++ b/scripts-ada/binutils/Makefile.am @@ -2,26 +2,23 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign 1.4 MKBINUTILSSPEC = $(SHELL) $(top_builddir)/mkbinutilspec -MKBINUTILSSPEC_DEPS = \ -$(top_builddir)/mkbinutilspec binutils.spec.in $(top_builddir)/setup.cache +MKBINUTILSSPEC_DEPS = $(top_builddir)/mkbinutilspec binutils.spec.in \ + $(top_builddir)/setup.cache sparc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems -TEMPLATES = \ -binutils.spec.in +TEMPLATES = binutils.spec.in -RPM_SPECS_DATA = \ -sparc-rtems-$(BINUTILSVERS).spec +RPM_SPECS_DATA = sparc-rtems-$(BINUTILSVERS).spec -noinst_DATA = \ -$(TEMPLATES) +noinst_DATA = $(TEMPLATES) -EXTRA_DIST = \ -$(TEMPLATES) +EXTRA_DIST = $(TEMPLATES) CLEANFILES = $(RPM_SPECS_DATA) +include $(top_srcdir)/../automake/local.am diff --git a/scripts-ada/gdb/Makefile.am b/scripts-ada/gdb/Makefile.am index 28c40a8ed5..13040218c6 100644 --- a/scripts-ada/gdb/Makefile.am +++ b/scripts-ada/gdb/Makefile.am @@ -2,12 +2,12 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign 1.4 MKGDBSPEC = $(SHELL) $(top_builddir)/mkgdbspec -MKGDBSPEC_DEPS = \ -$(top_builddir)/mkgdbspec gdb.spec.in $(top_builddir)/setup.cache +MKGDBSPEC_DEPS = $(top_builddir)/mkgdbspec gdb.spec.in \ + $(top_builddir)/setup.cache powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems @@ -15,17 +15,13 @@ powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) sparc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems -TEMPLATES = \ -gdb.spec.in +TEMPLATES = gdb.spec.in -RPM_SPECS_DATA = \ -powerpc-rtems-$(GDBVERS).spec \ -sparc-rtems-$(GDBVERS).spec +RPM_SPECS_DATA = powerpc-rtems-$(GDBVERS).spec sparc-rtems-$(GDBVERS).spec -noinst_DATA = \ -$(TEMPLATES) +noinst_DATA = $(TEMPLATES) -EXTRA_DIST = \ -$(TEMPLATES) +EXTRA_DIST = $(TEMPLATES) CLEANFILES = $(RPM_SPECS_DATA) +include $(top_srcdir)/../automake/local.am diff --git a/scripts-ada/gnatnewlib/Makefile.am b/scripts-ada/gnatnewlib/Makefile.am index 7f5196617a..52232e9c4d 100644 --- a/scripts-ada/gnatnewlib/Makefile.am +++ b/scripts-ada/gnatnewlib/Makefile.am @@ -1,11 +1,11 @@ ## $Id$ -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign 1.4 MKGNATNEWLIBSPEC = $(SHELL) $(top_builddir)/mkgnatnewlibspec -MKGNATNEWLIBSPEC_DEPS = \ - $(top_builddir)/mkgnatnewlibspec gnatnewlib.spec.in $(top_builddir)/setup.cache +MKGNATNEWLIBSPEC_DEPS = $(top_builddir)/mkgnatnewlibspec gnatnewlib.spec.in \ + $(top_builddir)/setup.cache powerpc-rtems-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS) $(MKGNATNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems @@ -13,17 +13,14 @@ powerpc-rtems-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS) sparc-rtems-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS) $(MKGNATNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems -TEMPLATES = \ -gnatnewlib.spec.in +TEMPLATES = gnatnewlib.spec.in -RPM_SPECS_DATA = \ -powerpc-rtems-$(GNATNEWLIBVERS).spec \ -sparc-rtems-$(GNATNEWLIBVERS).spec +RPM_SPECS_DATA = powerpc-rtems-$(GNATNEWLIBVERS).spec \ + sparc-rtems-$(GNATNEWLIBVERS).spec -noinst_DATA = \ -$(TEMPLATES) +noinst_DATA = $(TEMPLATES) -EXTRA_DIST = \ -$(TEMPLATES) +EXTRA_DIST = $(TEMPLATES) CLEANFILES = $(RPM_SPECS_DATA) +include $(top_srcdir)/../automake/local.am diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 2daa93a409..bea8976a1b 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -2,31 +2,24 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal SUBDIRS = . binutils gccnewlib gdb rtems -noinst_SCRIPTS = \ -setup \ -buildall \ -mkbinutilspec \ -mkbspspec \ -mkgccnewlibspec \ -mkgdbspec \ -mkrpms \ -mkspec +noinst_SCRIPTS = setup buildall mkbinutilspec mkbspspec mkgccnewlibspec \ + mkgdbspec mkrpms mkspec -TEMPLATES = +TEMPLATES = -noinst_DATA = \ -setup.def $(TEMPLATES) +noinst_DATA = setup.def $(TEMPLATES) -EXTRA_DIST = \ -$(noinst_DATA) \ -$(noinst_SCRIPTS) +EXTRA_DIST = $(noinst_DATA) $(noinst_SCRIPTS) CONFIGURE_DEPENDENCIES = setup.cache setup.cache: setup.def cp setup.def $@ DISTCLEANFILES = setup.cache +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/scripts/binutils/Makefile.am b/scripts/binutils/Makefile.am index 0e40d96a8e..062e79ffee 100644 --- a/scripts/binutils/Makefile.am +++ b/scripts/binutils/Makefile.am @@ -2,12 +2,12 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign 1.4 MKBINUTILSSPEC = $(SHELL) $(top_builddir)/mkbinutilspec -MKBINUTILSSPEC_DEPS = \ -$(top_builddir)/mkbinutilspec binutils.spec.in $(top_builddir)/setup.cache +MKBINUTILSSPEC_DEPS = $(top_builddir)/mkbinutilspec binutils.spec.in \ + $(top_builddir)/setup.cache hppa1.1-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems @@ -39,25 +39,18 @@ sh-rtemself-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) sparc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems -TEMPLATES = \ -binutils.spec.in +TEMPLATES = binutils.spec.in -RPM_SPECS_DATA = \ -hppa1.1-rtems-$(BINUTILSVERS).spec \ -i386-rtems-$(BINUTILSVERS).spec \ -i960-rtems-$(BINUTILSVERS).spec \ -m68k-rtems-$(BINUTILSVERS).spec \ -m68k-rtemself-$(BINUTILSVERS).spec \ -mips64orion-rtems-$(BINUTILSVERS).spec \ -powerpc-rtems-$(BINUTILSVERS).spec \ -sh-rtems-$(BINUTILSVERS).spec \ -sh-rtemself-$(BINUTILSVERS).spec \ -sparc-rtems-$(BINUTILSVERS).spec +RPM_SPECS_DATA = hppa1.1-rtems-$(BINUTILSVERS).spec \ + i386-rtems-$(BINUTILSVERS).spec i960-rtems-$(BINUTILSVERS).spec \ + m68k-rtems-$(BINUTILSVERS).spec m68k-rtemself-$(BINUTILSVERS).spec \ + mips64orion-rtems-$(BINUTILSVERS).spec \ + powerpc-rtems-$(BINUTILSVERS).spec sh-rtems-$(BINUTILSVERS).spec \ + sh-rtemself-$(BINUTILSVERS).spec sparc-rtems-$(BINUTILSVERS).spec -noinst_DATA = \ -$(TEMPLATES) +noinst_DATA = $(TEMPLATES) -EXTRA_DIST = \ -$(TEMPLATES) +EXTRA_DIST = $(TEMPLATES) CLEANFILES = $(RPM_SPECS_DATA) +include $(top_srcdir)/../automake/local.am diff --git a/scripts/gccnewlib/Makefile.am b/scripts/gccnewlib/Makefile.am index 659f284c81..2f3b030b65 100644 --- a/scripts/gccnewlib/Makefile.am +++ b/scripts/gccnewlib/Makefile.am @@ -2,17 +2,16 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign 1.4 MKGCCNEWLIBSPEC = $(SHELL) $(top_builddir)/mkgccnewlibspec C_ONLY_ARG = -a $(top_builddir)/gccnewlib/gccnewlib_c_only.spec.in -MKGCCNEWLIBSPEC_DEPS = \ - $(top_builddir)/mkgccnewlibspec gccnewlib.spec.in $(top_builddir)/setup.cache -MKGCCNEWLIB_C_ONLY_SPEC_DEPS = \ - $(top_builddir)/mkgccnewlibspec gccnewlib_c_only.spec.in \ - $(top_builddir)/setup.cache +MKGCCNEWLIBSPEC_DEPS = $(top_builddir)/mkgccnewlibspec gccnewlib.spec.in \ + $(top_builddir)/setup.cache +MKGCCNEWLIB_C_ONLY_SPEC_DEPS = $(top_builddir)/mkgccnewlibspec \ + gccnewlib_c_only.spec.in $(top_builddir)/setup.cache hppa1.1-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems @@ -44,26 +43,18 @@ sh-rtemself-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) sparc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems -TEMPLATES = \ -gccnewlib.spec.in \ -gccnewlib_c_only.spec.in +TEMPLATES = gccnewlib.spec.in gccnewlib_c_only.spec.in -RPM_SPECS_DATA = \ -hppa1.1-rtems-$(GCCNEWLIBVERS).spec \ -i386-rtems-$(GCCNEWLIBVERS).spec \ -i960-rtems-$(GCCNEWLIBVERS).spec \ -m68k-rtems-$(GCCNEWLIBVERS).spec \ -m68k-rtemself-$(GCCNEWLIBVERS).spec \ -mips64orion-rtems-$(GCCNEWLIBVERS).spec \ -powerpc-rtems-$(GCCNEWLIBVERS).spec \ -sh-rtems-$(GCCNEWLIBVERS).spec \ -sh-rtemself-$(GCCNEWLIBVERS).spec \ -sparc-rtems-$(GCCNEWLIBVERS).spec +RPM_SPECS_DATA = hppa1.1-rtems-$(GCCNEWLIBVERS).spec \ + i386-rtems-$(GCCNEWLIBVERS).spec i960-rtems-$(GCCNEWLIBVERS).spec \ + m68k-rtems-$(GCCNEWLIBVERS).spec m68k-rtemself-$(GCCNEWLIBVERS).spec \ + mips64orion-rtems-$(GCCNEWLIBVERS).spec \ + powerpc-rtems-$(GCCNEWLIBVERS).spec sh-rtems-$(GCCNEWLIBVERS).spec \ + sh-rtemself-$(GCCNEWLIBVERS).spec sparc-rtems-$(GCCNEWLIBVERS).spec -noinst_DATA = \ -$(TEMPLATES) +noinst_DATA = $(TEMPLATES) -EXTRA_DIST = \ -$(TEMPLATES) +EXTRA_DIST = $(TEMPLATES) CLEANFILES = $(RPM_SPECS_DATA) +include $(top_srcdir)/../automake/local.am diff --git a/scripts/gdb/Makefile.am b/scripts/gdb/Makefile.am index 16bd1e449c..78ad98922f 100644 --- a/scripts/gdb/Makefile.am +++ b/scripts/gdb/Makefile.am @@ -2,12 +2,12 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign 1.4 MKGDBSPEC = $(SHELL) $(top_builddir)/mkgdbspec -MKGDBSPEC_DEPS = \ -$(top_builddir)/mkgdbspec gdb.spec.in $(top_builddir)/setup.cache +MKGDBSPEC_DEPS = $(top_builddir)/mkgdbspec gdb.spec.in \ + $(top_builddir)/setup.cache hppa1.1-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems @@ -39,25 +39,17 @@ sh-rtemself-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) sparc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems -TEMPLATES = \ -gdb.spec.in +TEMPLATES = gdb.spec.in -RPM_SPECS_DATA = \ -hppa1.1-rtems-$(GDBVERS).spec \ -i386-rtems-$(GDBVERS).spec \ -i960-rtems-$(GDBVERS).spec \ -m68k-rtems-$(GDBVERS).spec \ -m68k-rtemself-$(GDBVERS).spec \ -mips64orion-rtems-$(GDBVERS).spec \ -powerpc-rtems-$(GDBVERS).spec \ -sh-rtems-$(GDBVERS).spec \ -sh-rtemself-$(GDBVERS).spec \ -sparc-rtems-$(GDBVERS).spec +RPM_SPECS_DATA = hppa1.1-rtems-$(GDBVERS).spec i386-rtems-$(GDBVERS).spec \ + i960-rtems-$(GDBVERS).spec m68k-rtems-$(GDBVERS).spec \ + m68k-rtemself-$(GDBVERS).spec mips64orion-rtems-$(GDBVERS).spec \ + powerpc-rtems-$(GDBVERS).spec sh-rtems-$(GDBVERS).spec \ + sh-rtemself-$(GDBVERS).spec sparc-rtems-$(GDBVERS).spec -noinst_DATA = \ -$(TEMPLATES) +noinst_DATA = $(TEMPLATES) -EXTRA_DIST = \ -$(TEMPLATES) +EXTRA_DIST = $(TEMPLATES) CLEANFILES = $(RPM_SPECS_DATA) +include $(top_srcdir)/../automake/local.am diff --git a/scripts/rtems/Makefile.am b/scripts/rtems/Makefile.am index d6cce0214d..e8a8026821 100644 --- a/scripts/rtems/Makefile.am +++ b/scripts/rtems/Makefile.am @@ -2,11 +2,12 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign 1.4 MKBSPSPEC = $(SHELL) $(top_builddir)/mkbspspec -MKBSPSPEC_DEPS = $(top_builddir)/mkbspspec rtems.spec.in $(top_builddir)/setup.cache +MKBSPSPEC_DEPS = $(top_builddir)/mkbspspec rtems.spec.in \ + $(top_builddir)/setup.cache hppa1.1-rtems-simhppa-$(BSPVERS).spec: $(MKBSPSPEC_DEPS) $(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems simhppa @@ -38,25 +39,19 @@ sh-rtemself-gensh1-$(BSPVERS).spec: $(MKBSPSPEC_DEPS) sparc-rtems-erc32-$(BSPVERS).spec: $(MKBSPSPEC_DEPS) $(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems erc32 -TEMPLATES = \ -rtems.spec.in +TEMPLATES = rtems.spec.in -RPM_SPECS_DATA = \ -hppa1.1-rtems-simhppa-$(BSPVERS).spec \ -i386-rtems-pc386-$(BSPVERS).spec \ -i960-rtems-cvme961-$(BSPVERS).spec \ -m68k-rtems-gen68360-$(BSPVERS).spec \ -m68k-rtemself-gen68360-$(BSPVERS).spec \ -mips64orion-rtems-p4600-$(BSPVERS).spec \ -powerpc-rtems-mcp750-$(BSPVERS).spec \ -sh-rtems-gensh1-$(BSPVERS).spec \ -sh-rtemself-gensh1-$(BSPVERS).spec \ -sparc-rtems-erc32-$(BSPVERS).spec +RPM_SPECS_DATA = hppa1.1-rtems-simhppa-$(BSPVERS).spec \ + i386-rtems-pc386-$(BSPVERS).spec i960-rtems-cvme961-$(BSPVERS).spec \ + m68k-rtems-gen68360-$(BSPVERS).spec \ + m68k-rtemself-gen68360-$(BSPVERS).spec \ + mips64orion-rtems-p4600-$(BSPVERS).spec \ + powerpc-rtems-mcp750-$(BSPVERS).spec sh-rtems-gensh1-$(BSPVERS).spec \ + sh-rtemself-gensh1-$(BSPVERS).spec sparc-rtems-erc32-$(BSPVERS).spec -noinst_DATA = \ -$(TEMPLATES) +noinst_DATA = $(TEMPLATES) -EXTRA_DIST = \ -$(TEMPLATES) +EXTRA_DIST = $(TEMPLATES) CLEANFILES = $(RPM_SPECS_DATA) +include $(top_srcdir)/../automake/local.am diff --git a/tools/build/Makefile.am b/tools/build/Makefile.am index 5135cc31b2..81ba93bece 100644 --- a/tools/build/Makefile.am +++ b/tools/build/Makefile.am @@ -5,20 +5,17 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -bin_PROGRAMS = cklength eolstrip packhex unhex +bin_PROGRAMS = cklength eolstrip packhex unhex noinst_PROGRAMS = binpatch cklength_SOURCES = cklength.c eolstrip_SOURCES = eolstrip.c -packhex_SOURCES = packhex.c -unhex_SOURCES = unhex.c +packhex_SOURCES = packhex.c +unhex_SOURCES = unhex.c binpatch_SOURCES = binpatch.c -bin_SCRIPTS=\ -install-if-change \ -lock-directory \ -unlock-directory +bin_SCRIPTS = install-if-change lock-directory unlock-directory noinst_SCRIPTS = search-id.sh diff --git a/tools/cpu/generic/Makefile.am b/tools/cpu/generic/Makefile.am index 0df1031191..0d6f395093 100644 --- a/tools/cpu/generic/Makefile.am +++ b/tools/cpu/generic/Makefile.am @@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -noinst_SCRIPTS=size_rtems +noinst_SCRIPTS = size_rtems include $(top_srcdir)/../../../automake/host.am diff --git a/tools/cpu/hppa1.1/Makefile.am b/tools/cpu/hppa1.1/Makefile.am index 293d882c6d..ebbd28bc02 100644 --- a/tools/cpu/hppa1.1/Makefile.am +++ b/tools/cpu/hppa1.1/Makefile.am @@ -5,17 +5,14 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -noinst_PROGRAMS=genoffsets +noinst_PROGRAMS = genoffsets -genoffsets_SOURCES = \ -genoffsets.c +genoffsets_SOURCES = genoffsets.c ## We use files that have not been installed yet. -CPU_DIR=../../cpu/$(RTEMS_CPU) +CPU_DIR = ../../cpu/$(RTEMS_CPU) -AM_CPPFLAGS = \ --I$(PROJECT_INCLUDE) \ --I$(CPU_DIR) +AM_CPPFLAGS = -I$(PROJECT_INCLUDE) -I$(CPU_DIR) include $(top_srcdir)/../../../automake/host.am diff --git a/tools/cpu/sh/Makefile.am b/tools/cpu/sh/Makefile.am index 456eb6dee6..541f1758b5 100644 --- a/tools/cpu/sh/Makefile.am +++ b/tools/cpu/sh/Makefile.am @@ -5,12 +5,9 @@ AUTOMAKE_OPTIONS = foreign 1.4 no-installman ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -noinst_PROGRAMS=shgen +noinst_PROGRAMS = shgen -shgen_SOURCES = \ -sci.h \ -sci.c \ -shgen.c +shgen_SOURCES = sci.h sci.c shgen.c if HELP2MAN man_MANS = shgen.1 diff --git a/tools/cpu/unix/Makefile.am b/tools/cpu/unix/Makefile.am index 780884618b..1ade15085d 100644 --- a/tools/cpu/unix/Makefile.am +++ b/tools/cpu/unix/Makefile.am @@ -5,8 +5,8 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -noinst_PROGRAMS=gensize +noinst_PROGRAMS = gensize -gensize_SOURCES=gensize.c +gensize_SOURCES = gensize.c include $(top_srcdir)/../../../automake/host.am diff --git a/tools/update/Makefile.am b/tools/update/Makefile.am index 47f3abfbf9..6277439559 100644 --- a/tools/update/Makefile.am +++ b/tools/update/Makefile.am @@ -4,6 +4,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal + ## NOTE: It doesn't make much sense to install these files CLEANFILES = update word-replace @@ -12,16 +13,10 @@ if PERL # All files in this directory depend on having perl. # Do not handle them if perl is missing. -noinst_SCRIPTS = \ -acpolish \ -ampolish \ -cipolish \ -rtems-polish.sh \ -word-replace \ -update +noinst_SCRIPTS = acpolish ampolish cipolish rtems-polish.sh word-replace \ + update -noinst_DATA = \ -310_to_320_list +noinst_DATA = 310_to_320_list update: $(srcdir)/update.in $(top_builddir)/config.status @cd $(top_builddir) \ @@ -35,13 +30,7 @@ word-replace: $(srcdir)/word-replace.in $(top_builddir)/config.status endif -EXTRA_DIST = \ -310_to_320_list \ -update.in \ -word-replace.in \ -acpolish \ -ampolish \ -cipolish \ -rtems-polish.sh +EXTRA_DIST = 310_to_320_list update.in word-replace.in acpolish ampolish \ + cipolish rtems-polish.sh include $(top_srcdir)/../../automake/host.am |