diff options
Diffstat (limited to 'c/src/exec/score')
58 files changed, 1133 insertions, 967 deletions
diff --git a/c/src/exec/score/Makefile.in b/c/src/exec/score/Makefile.in index af89e210c2..a0e1da3d81 100644 --- a/c/src/exec/score/Makefile.in +++ b/c/src/exec/score/Makefile.in @@ -5,21 +5,30 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../.. -subdir = c/src/exec/score +top_builddir = .. +subdir = score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=include $(INLINE) tools cpu src +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + +SUB_DIRS = include $(INLINE) cpu src + +preinstall: + $(mkinstalldirs) $(INSTALLDIRS) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/Makefile.in b/c/src/exec/score/cpu/Makefile.in index bd4dcfcace..b3cf43c129 100644 --- a/c/src/exec/score/cpu/Makefile.in +++ b/c/src/exec/score/cpu/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/score/cpu +top_builddir = ../.. +subdir = score/cpu -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=$(RTEMS_CPU) +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = $(RTEMS_CPU) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/a29k/Makefile.in b/c/src/exec/score/cpu/a29k/Makefile.in index eca4ae3e84..77189b6ebf 100644 --- a/c/src/exec/score/cpu/a29k/Makefile.in +++ b/c/src/exec/score/cpu/a29k/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/cpu/a29k +top_builddir = ../../.. +subdir = score/cpu/a29k -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = rtems wrap -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/a29k/rtems/Makefile.in b/c/src/exec/score/cpu/a29k/rtems/Makefile.in index 858e8a9d05..4223a60d7c 100644 --- a/c/src/exec/score/cpu/a29k/rtems/Makefile.in +++ b/c/src/exec/score/cpu/a29k/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/a29k/rtems +top_builddir = ../../../.. +subdir = score/cpu/a29k/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/a29k/rtems/score/Makefile.in b/c/src/exec/score/cpu/a29k/rtems/score/Makefile.in index 01e9cbe014..5ca7a8a600 100644 --- a/c/src/exec/score/cpu/a29k/rtems/score/Makefile.in +++ b/c/src/exec/score/cpu/a29k/rtems/score/Makefile.in @@ -5,46 +5,52 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../../.. -subdir = c/src/exec/score/cpu/a29k/rtems/score +top_builddir = ../../../../.. +subdir = score/cpu/a29k/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES=a29k.h a29ktypes.h cpu.h cpu_asm.h -H_FILES=$(H_PIECES:%=$(srcdir)/%) +H_PIECES = a29k.h a29ktypes.h cpu.h cpu_asm.h +H_FILES = $(H_PIECES:%=$(srcdir)/%) # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -58,13 +64,11 @@ CLOBBER_ADDITIONS += $(BUILT_SOURCES) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -all: install-headers - -install-headers: ${H_FILES} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall -preinstall: install-headers +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/a29k/wrap/Makefile.in b/c/src/exec/score/cpu/a29k/wrap/Makefile.in index f06c307655..6bba7cdf65 100644 --- a/c/src/exec/score/cpu/a29k/wrap/Makefile.in +++ b/c/src/exec/score/cpu/a29k/wrap/Makefile.in @@ -12,48 +12,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/a29k/wrap +top_builddir = ../../../.. +subdir = score/cpu/a29k/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@/.. -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c -C_PIECES = cpu -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = cpu +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) H_PIECES = amd.ah asm.h cpu_asm.h pswmacro.ah register.ah -H_FILES=$(H_PIECES:%=$(srcdir)/../%) +H_FILES = $(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S S_PIECES = cpu_asm sig -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -I$(srcdir)/.. -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -65,8 +71,8 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) - $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) + $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) @@ -74,11 +80,11 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/hppa1.1/Makefile.in b/c/src/exec/score/cpu/hppa1.1/Makefile.in index 70ce803133..51f1dd9be6 100644 --- a/c/src/exec/score/cpu/hppa1.1/Makefile.in +++ b/c/src/exec/score/cpu/hppa1.1/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/cpu/hppa1.1 +top_builddir = ../../.. +subdir = score/cpu/hppa1.1 -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = rtems wrap -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.in b/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.in index 8e5a41fa53..bc40b4454c 100644 --- a/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.in +++ b/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/hppa1.1/rtems +top_builddir = ../../../.. +subdir = score/cpu/hppa1.1/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.in b/c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.in index 02bb5dd613..f5d976b409 100644 --- a/c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.in +++ b/c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.in @@ -5,12 +5,10 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../../.. -subdir = c/src/exec/score/cpu/hppa1.1/rtems/score +top_builddir = ../../../../.. +subdir = score/cpu/hppa1.1/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ @@ -18,40 +16,49 @@ VPATH = @srcdir@ BUILT_SOURCES = offsets.h # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES=cpu.h hppa.h cpu_asm.h hppatypes.h -H_FILES=$(H_PIECES:%=$(srcdir)/%) offsets.h +H_PIECES = cpu.h hppa.h cpu_asm.h hppatypes.h +H_FILES = $(H_PIECES:%=$(srcdir)/%) offsets.h # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + +GENOFFSETS = $(PROJECT_ROOT)/tools/cpu/hppa1.1/genoffsets + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += offsets.h: $(GENOFFSETS) cpu.h $(RM) $@ $(GENOFFSETS) > $@ - $(CHMOD) -w $@ # # Add your list of files to delete here. The config files @@ -65,13 +72,11 @@ CLOBBER_ADDITIONS += $(BUILT_SOURCES) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -all: install-headers - -install-headers: ${H_FILES} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall -preinstall: install-headers +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/hppa1.1/wrap/Makefile.in b/c/src/exec/score/cpu/hppa1.1/wrap/Makefile.in index c03b653d21..b53df079a8 100644 --- a/c/src/exec/score/cpu/hppa1.1/wrap/Makefile.in +++ b/c/src/exec/score/cpu/hppa1.1/wrap/Makefile.in @@ -12,48 +12,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/hppa1.1/wrap +top_builddir = ../../../.. +subdir = score/cpu/hppa1.1/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@/.. -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES = -H_FILES=$(H_PIECES:%=$(srcdir)/../%) +H_PIECES = +H_FILES = $(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S S_PIECES = cpu_asm rtems -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -I$(srcdir)/.. -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -65,8 +71,8 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) - $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) + $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) @@ -74,11 +80,11 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/i386/Makefile.in b/c/src/exec/score/cpu/i386/Makefile.in index 142630b05a..7c55ed596a 100644 --- a/c/src/exec/score/cpu/i386/Makefile.in +++ b/c/src/exec/score/cpu/i386/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/cpu/i386 +top_builddir = ../../.. +subdir = score/cpu/i386 -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = rtems wrap -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/i386/rtems/Makefile.in b/c/src/exec/score/cpu/i386/rtems/Makefile.in index f152d6d340..bd3aa34f9c 100644 --- a/c/src/exec/score/cpu/i386/rtems/Makefile.in +++ b/c/src/exec/score/cpu/i386/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/i386/rtems +top_builddir = ../../../.. +subdir = score/cpu/i386/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/i386/rtems/score/Makefile.in b/c/src/exec/score/cpu/i386/rtems/score/Makefile.in index 2b5504a981..4bc752a8e0 100644 --- a/c/src/exec/score/cpu/i386/rtems/score/Makefile.in +++ b/c/src/exec/score/cpu/i386/rtems/score/Makefile.in @@ -5,46 +5,52 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../../.. -subdir = c/src/exec/score/cpu/i386/rtems/score +top_builddir = ../../../../.. +subdir = score/cpu/i386/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES=cpu.h i386.h i386types.h -H_FILES=$(H_PIECES:%=$(srcdir)/%) +H_PIECES = cpu.h i386.h i386types.h +H_FILES = $(H_PIECES:%=$(srcdir)/%) # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -58,13 +64,11 @@ CLOBBER_ADDITIONS += $(BUILT_SOURCES) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -all: install-headers - -install-headers: ${H_FILES} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall -preinstall: install-headers +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/i386/wrap/Makefile.in b/c/src/exec/score/cpu/i386/wrap/Makefile.in index 5cdc43fbb2..b7e005a8f2 100644 --- a/c/src/exec/score/cpu/i386/wrap/Makefile.in +++ b/c/src/exec/score/cpu/i386/wrap/Makefile.in @@ -12,48 +12,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/i386/wrap +top_builddir = ../../../.. +subdir = score/cpu/i386/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@/.. -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) H_PIECES = asm.h -H_FILES=$(H_PIECES:%=$(srcdir)/../%) +H_FILES = $(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S S_PIECES = cpu_asm -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -I$(srcdir)/.. -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -65,8 +71,8 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) - $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) + $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) @@ -74,11 +80,11 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/i960/Makefile.in b/c/src/exec/score/cpu/i960/Makefile.in index d796b66dcd..b8455b537b 100644 --- a/c/src/exec/score/cpu/i960/Makefile.in +++ b/c/src/exec/score/cpu/i960/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/cpu/i960 +top_builddir = ../../.. +subdir = score/cpu/i960 -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = rtems wrap -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/i960/rtems/Makefile.in b/c/src/exec/score/cpu/i960/rtems/Makefile.in index c46c893a31..bc6ebfa89b 100644 --- a/c/src/exec/score/cpu/i960/rtems/Makefile.in +++ b/c/src/exec/score/cpu/i960/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/i960/rtems +top_builddir = ../../../.. +subdir = score/cpu/i960/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/i960/rtems/score/Makefile.in b/c/src/exec/score/cpu/i960/rtems/score/Makefile.in index 5c96ca0f31..751f69ff64 100644 --- a/c/src/exec/score/cpu/i960/rtems/score/Makefile.in +++ b/c/src/exec/score/cpu/i960/rtems/score/Makefile.in @@ -5,46 +5,52 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../../.. -subdir = c/src/exec/score/cpu/i960/rtems/score +top_builddir = ../../../../.. +subdir = score/cpu/i960/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES=cpu.h i960.h i960types.h -H_FILES=$(H_PIECES:%=$(srcdir)/%) +H_PIECES = cpu.h i960.h i960types.h +H_FILES = $(H_PIECES:%=$(srcdir)/%) # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -58,13 +64,11 @@ CLOBBER_ADDITIONS += $(BUILT_SOURCES) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -all: install-headers - -install-headers: ${H_FILES} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall -preinstall: install-headers +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/i960/wrap/Makefile.in b/c/src/exec/score/cpu/i960/wrap/Makefile.in index e572dbd937..ae2d6518a2 100644 --- a/c/src/exec/score/cpu/i960/wrap/Makefile.in +++ b/c/src/exec/score/cpu/i960/wrap/Makefile.in @@ -12,48 +12,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/i960/wrap +top_builddir = ../../../.. +subdir = score/cpu/i960/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@/.. -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) H_PIECES = asm.h -H_FILES=$(H_PIECES:%=$(srcdir)/../%) +H_FILES = $(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S S_PIECES = cpu_asm rtems -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -I$(srcdir)/.. -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -65,8 +71,8 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) - $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) + $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) @@ -74,11 +80,11 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/m68k/Makefile.in b/c/src/exec/score/cpu/m68k/Makefile.in index 6374942996..fd39467bc7 100644 --- a/c/src/exec/score/cpu/m68k/Makefile.in +++ b/c/src/exec/score/cpu/m68k/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/cpu/m68k +top_builddir = ../../.. +subdir = score/cpu/m68k -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = rtems wrap -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/m68k/rtems/Makefile.in b/c/src/exec/score/cpu/m68k/rtems/Makefile.in index efdac203ab..1ec77aa080 100644 --- a/c/src/exec/score/cpu/m68k/rtems/Makefile.in +++ b/c/src/exec/score/cpu/m68k/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/m68k/rtems +top_builddir = ../../../.. +subdir = score/cpu/m68k/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/m68k/rtems/score/Makefile.in b/c/src/exec/score/cpu/m68k/rtems/score/Makefile.in index 7027ddeb60..3108e969fd 100644 --- a/c/src/exec/score/cpu/m68k/rtems/score/Makefile.in +++ b/c/src/exec/score/cpu/m68k/rtems/score/Makefile.in @@ -5,46 +5,52 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../../.. -subdir = c/src/exec/score/cpu/m68k/rtems/score +top_builddir = ../../../../.. +subdir = score/cpu/m68k/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES=cpu.h m68k.h m68ktypes.h -H_FILES=$(H_PIECES:%=$(srcdir)/%) +H_PIECES = cpu.h m68k.h m68ktypes.h +H_FILES = $(H_PIECES:%=$(srcdir)/%) # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -58,13 +64,11 @@ CLOBBER_ADDITIONS += $(BUILT_SOURCES) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -all: install-headers - -install-headers: ${H_FILES} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall -preinstall: install-headers +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/m68k/wrap/Makefile.in b/c/src/exec/score/cpu/m68k/wrap/Makefile.in index e254525fad..75cedf9c00 100644 --- a/c/src/exec/score/cpu/m68k/wrap/Makefile.in +++ b/c/src/exec/score/cpu/m68k/wrap/Makefile.in @@ -12,48 +12,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/m68k/wrap +top_builddir = ../../../.. +subdir = score/cpu/m68k/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@/.. -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu memcpy -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) H_PIECES = asm.h m68302.h m68360.h qsm.h sim.h -H_FILES=$(H_PIECES:%=$(srcdir)/../%) +H_FILES = $(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S S_PIECES = cpu_asm -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -I$(srcdir)/.. -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -65,8 +71,8 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) - $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) + $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) @@ -74,11 +80,11 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/mips64orion/Makefile.in b/c/src/exec/score/cpu/mips64orion/Makefile.in index eab2f921d9..1dcb6268a8 100644 --- a/c/src/exec/score/cpu/mips64orion/Makefile.in +++ b/c/src/exec/score/cpu/mips64orion/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/cpu/mips64orion +top_builddir = ../../.. +subdir = score/cpu/mips64orion -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = rtems wrap -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/mips64orion/rtems/Makefile.in b/c/src/exec/score/cpu/mips64orion/rtems/Makefile.in index cab84284fa..57556e17a3 100644 --- a/c/src/exec/score/cpu/mips64orion/rtems/Makefile.in +++ b/c/src/exec/score/cpu/mips64orion/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/mips64orion/rtems +top_builddir = ../../../.. +subdir = score/cpu/mips64orion/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.in b/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.in index 182dba415e..dcb0a273bb 100644 --- a/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.in +++ b/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.in @@ -5,46 +5,52 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../../.. -subdir = c/src/exec/score/cpu/mips64orion/rtems/score +top_builddir = ../../../../.. +subdir = score/cpu/mips64orion/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES=cpu.h mips64orion.h mipstypes.h -H_FILES=$(H_PIECES:%=$(srcdir)/%) +H_PIECES = cpu.h mips64orion.h mipstypes.h +H_FILES = $(H_PIECES:%=$(srcdir)/%) # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -58,13 +64,11 @@ CLOBBER_ADDITIONS += $(BUILT_SOURCES) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -all: install-headers - -install-headers: ${H_FILES} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall -preinstall: install-headers +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/mips64orion/wrap/Makefile.in b/c/src/exec/score/cpu/mips64orion/wrap/Makefile.in index cf0af8409b..4b85208aef 100644 --- a/c/src/exec/score/cpu/mips64orion/wrap/Makefile.in +++ b/c/src/exec/score/cpu/mips64orion/wrap/Makefile.in @@ -12,48 +12,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/mips64orion/wrap +top_builddir = ../../../.. +subdir = score/cpu/mips64orion/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@/.. -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) H_PIECES = asm.h cpu_asm.h idtcpu.h idtmon.h iregdef.h -H_FILES=$(H_PIECES:%=$(srcdir)/../%) +H_FILES = $(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S S_PIECES = cpu_asm -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -I$(srcdir)/.. -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -65,8 +71,8 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) - $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) + $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) @@ -74,11 +80,11 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/no_cpu/Makefile.in b/c/src/exec/score/cpu/no_cpu/Makefile.in index e055f5115c..328077416d 100644 --- a/c/src/exec/score/cpu/no_cpu/Makefile.in +++ b/c/src/exec/score/cpu/no_cpu/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/cpu/no_cpu +top_builddir = ../../.. +subdir = score/cpu/no_cpu -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = rtems wrap -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/no_cpu/rtems/Makefile.in b/c/src/exec/score/cpu/no_cpu/rtems/Makefile.in index ed2d8c5d85..ca0ca45e05 100644 --- a/c/src/exec/score/cpu/no_cpu/rtems/Makefile.in +++ b/c/src/exec/score/cpu/no_cpu/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/no_cpu/rtems +top_builddir = ../../../.. +subdir = score/cpu/no_cpu/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.in b/c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.in index c4671e7120..1eccbd61c9 100644 --- a/c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.in +++ b/c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.in @@ -5,46 +5,52 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../../.. -subdir = c/src/exec/score/cpu/no_cpu/rtems/score +top_builddir = ../../../../.. +subdir = score/cpu/no_cpu/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES=cpu.h no_cpu.h no_cputypes.h -H_FILES=$(H_PIECES:%=$(srcdir)/%) +H_PIECES = cpu.h no_cpu.h no_cputypes.h +H_FILES = $(H_PIECES:%=$(srcdir)/%) # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -58,13 +64,12 @@ CLOBBER_ADDITIONS += $(BUILT_SOURCES) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -all: install-headers -install-headers: ${H_FILES} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall -preinstall: install-headers +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in b/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in index e5c27120bf..23f68c9819 100644 --- a/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in +++ b/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in @@ -12,48 +12,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/no_cpu/wrap +top_builddir = ../../../.. +subdir = score/cpu/no_cpu/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@/.. -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu cpu_asm -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) H_PIECES = asm.h -H_FILES=$(H_PIECES:%=$(srcdir)/../%) +H_FILES = $(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S -S_PIECES = -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -I$(srcdir)/.. -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -65,7 +71,7 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) $(OBJS) $(ARCH)/rtems.o $(RELS) +all: ${ARCH} $(SRCS) $(OBJS) $(ARCH)/rtems.o $(RELS) $(ARCH)/rtems.o: rtems.c @@ -75,11 +81,11 @@ $(ARCH)/rtems.o: rtems.c # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/powerpc/Makefile.in b/c/src/exec/score/cpu/powerpc/Makefile.in index 231f199ef3..00b07e15c4 100644 --- a/c/src/exec/score/cpu/powerpc/Makefile.in +++ b/c/src/exec/score/cpu/powerpc/Makefile.in @@ -1,33 +1,36 @@ # # $Id$ # -# +# # $Id$ # @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/cpu/powerpc - -INSTALL = @INSTALL@ +top_builddir = ../../.. +subdir = score/cpu/powerpc -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SHARED_LIB=shared +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SHARED_LIB = shared ifeq ($(RTEMS_CPU_MODEL),mpc750) -CPUDIR=mpc750 -else -CPUDIR=other_cpu -endif +CPUDIR = other_cpu +else +CPUDIR = other_cpu +endif -SUB_DIRS=$(CPUDIR) $(SHARED_LIB) +SUB_DIRS = $(CPUDIR) $(SHARED_LIB) +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/powerpc/mpc750/Makefile.in b/c/src/exec/score/cpu/powerpc/mpc750/Makefile.in index f50d88ca4d..547e9ab97e 100644 --- a/c/src/exec/score/cpu/powerpc/mpc750/Makefile.in +++ b/c/src/exec/score/cpu/powerpc/mpc750/Makefile.in @@ -5,54 +5,61 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/powerpc/wrap +top_builddir = ../../../.. +subdir = score/cpu/powerpc/mpc750 -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) ROOT_H_PIECES = -ROOT_H_FILES=$(ROOT_H_PIECES:%=$(srcdir)/%) -RTEMS_SCORE_H_PIECES=cpu.h -RTEMS_SCORE_H_FILES=$(RTEMS_SCORE_H_PIECES:%=$(srcdir)/%) -H_PIECES=$(ROOT_H_PIECES) $(RTEMS_SCORE_H_PIECES) -H_FILES=$(H_PIECES%=$(srcdir)/%) -I_PIECES= c_isr -I_FILES=$(I_PIECES:%=$(srcdir)/%.inl) +ROOT_H_FILES = $(ROOT_H_PIECES:%=$(srcdir)/%) +RTEMS_SCORE_H_PIECES = cpu.h +RTEMS_SCORE_H_FILES = $(RTEMS_SCORE_H_PIECES:%=$(srcdir)/%) +H_PIECES = $(ROOT_H_PIECES) $(RTEMS_SCORE_H_PIECES) +H_FILES = $(H_PIECES%=$(srcdir)/%) +I_PIECES = c_isr +I_FILES = $(I_PIECES:%=$(srcdir)/%.inl) # Assembly source names, if any, go here -- minus the .S -S_PIECES = cpu_asm -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = cpu_asm +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) $(I_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) \ + $(I_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += -CPPFLAGS += -CFLAGS += $(CFLAGS_OS_V) +DEFINES += +CPPFLAGS += +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -61,23 +68,23 @@ LDFLAGS += # 'make clobber' already includes 'make clean' # -CLEAN_ADDITIONS += +CLEAN_ADDITIONS += CLOBBER_ADDITIONS += ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) $(make-rel) -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS) +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${RTEMS_SCORE_H_FILES} ${I_FILES} $(PROJECT_INCLUDE)/rtems/score - $(INSTALL_CHANGE) -m 444 ${ROOT_H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(RTEMS_SCORE_H_FILES) $(I_FILES) $(PROJECT_INCLUDE)/rtems/score + @$(INSTALL_CHANGE) -m 644 $(ROOT_H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/powerpc/other_cpu/Makefile.in b/c/src/exec/score/cpu/powerpc/other_cpu/Makefile.in index dd38dc7bf2..962cc60fc7 100644 --- a/c/src/exec/score/cpu/powerpc/other_cpu/Makefile.in +++ b/c/src/exec/score/cpu/powerpc/other_cpu/Makefile.in @@ -5,54 +5,61 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/powerpc/wrap +top_builddir = ../../../.. +subdir = score/cpu/powerpc/other_cpu -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu ppccache -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) ROOT_H_PIECES = -ROOT_H_FILES=$(ROOT_H_PIECES:%=$(srcdir)/%) -RTEMS_SCORE_H_PIECES=cpu.h -RTEMS_SCORE_H_FILES=$(RTEMS_SCORE_H_PIECES:%=$(srcdir)/%) -H_PIECES=$(ROOT_H_PIECES) $(RTEMS_SCORE_H_PIECES) -H_FILES=$(H_PIECES%=$(srcdir)/%) -I_PIECES= c_isr -I_FILES=$(I_PIECES:%=$(srcdir)/%.inl) +ROOT_H_FILES = $(ROOT_H_PIECES:%=$(srcdir)/%) +RTEMS_SCORE_H_PIECES = cpu.h +RTEMS_SCORE_H_FILES = $(RTEMS_SCORE_H_PIECES:%=$(srcdir)/%) +H_PIECES = $(ROOT_H_PIECES) $(RTEMS_SCORE_H_PIECES) +H_FILES = $(H_PIECES%=$(srcdir)/%) +I_PIECES = c_isr +I_FILES = $(I_PIECES:%=$(srcdir)/%.inl) # Assembly source names, if any, go here -- minus the .S S_PIECES = cpu_asm rtems # irq_stub -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) $(I_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) \ + $(I_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += -CPPFLAGS += -CFLAGS += $(CFLAGS_OS_V) +DEFINES += +CPPFLAGS += +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -61,23 +68,23 @@ LDFLAGS += # 'make clobber' already includes 'make clean' # -CLEAN_ADDITIONS += +CLEAN_ADDITIONS += CLOBBER_ADDITIONS += ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) $(make-rel) -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS) +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${RTEMS_SCORE_H_FILES} ${I_FILES} $(PROJECT_INCLUDE)/rtems/score - $(INSTALL_CHANGE) -m 444 ${ROOT_H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(RTEMS_SCORE_H_FILES) $(I_FILES) $(PROJECT_INCLUDE)/rtems/score + @$(INSTALL_CHANGE) -m 644 $(ROOT_H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/powerpc/shared/Makefile.in b/c/src/exec/score/cpu/powerpc/shared/Makefile.in index 1b6dd81aa4..d42976055a 100644 --- a/c/src/exec/score/cpu/powerpc/shared/Makefile.in +++ b/c/src/exec/score/cpu/powerpc/shared/Makefile.in @@ -5,52 +5,58 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/powerpc/shared +top_builddir = ../../../.. +subdir = score/cpu/powerpc/shared -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -RELS= +RELS = # C source names, if any, go here -- minus the .c C_PIECES = -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) ROOT_H_PIECES = asm.h -ROOT_H_FILES=$(ROOT_H_PIECES:%=$(srcdir)/%) -RTEMS_SCORE_H_PIECES=ppc.h ppctypes.h -RTEMS_SCORE_H_FILES=$(RTEMS_SCORE_H_PIECES:%=$(srcdir)/%) -H_PIECES=$(ROOT_H_PIECES) $(RTEMS_SCORE_H_PIECES) -H_FILES=$(H_PIECES%=$(srcdir)/%) +ROOT_H_FILES = $(ROOT_H_PIECES:%=$(srcdir)/%) +RTEMS_SCORE_H_PIECES = ppc.h ppctypes.h +RTEMS_SCORE_H_FILES = $(RTEMS_SCORE_H_PIECES:%=$(srcdir)/%) +H_PIECES = $(ROOT_H_PIECES) $(RTEMS_SCORE_H_PIECES) +H_FILES = $(H_PIECES%=$(srcdir)/%) # Assembly source names, if any, go here -- minus the .S S_PIECES = -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += -CPPFLAGS += -CFLAGS += $(CFLAGS_OS_V) +DEFINES += +CPPFLAGS += +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -59,19 +65,19 @@ LDFLAGS += # 'make clobber' already includes 'make clean' # -CLEAN_ADDITIONS += +CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all:$(SRCS) preinstall +all: $(SRCS) preinstall # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${RTEMS_SCORE_H_FILES} $(PROJECT_INCLUDE)/rtems/score - $(INSTALL_CHANGE) -m 444 ${ROOT_H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(RTEMS_SCORE_H_FILES) $(PROJECT_INCLUDE)/rtems/score + @$(INSTALL_CHANGE) -m 644 $(ROOT_H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/powerpc/wrap/Makefile.in b/c/src/exec/score/cpu/powerpc/wrap/Makefile.in index d7605800df..91b3b12375 100644 --- a/c/src/exec/score/cpu/powerpc/wrap/Makefile.in +++ b/c/src/exec/score/cpu/powerpc/wrap/Makefile.in @@ -12,48 +12,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/powerpc/wrap +top_builddir = ../../../.. +subdir = score/cpu/powerpc/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@/.. -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu ppccache -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) H_PIECES = asm.h mpc860.h mpc821.h -H_FILES=$(H_PIECES:%=$(srcdir)/../%) +H_FILES = $(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S S_PIECES = cpu_asm rtems # irq_stub -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -I$(srcdir)/.. -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -65,8 +71,8 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) - $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) + $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) @@ -74,11 +80,11 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/sh/Makefile.in b/c/src/exec/score/cpu/sh/Makefile.in index 7e1411b994..3bea7f2412 100644 --- a/c/src/exec/score/cpu/sh/Makefile.in +++ b/c/src/exec/score/cpu/sh/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/cpu/sh +top_builddir = ../../.. +subdir = score/cpu/sh -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = rtems wrap -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/sh/rtems/Makefile.in b/c/src/exec/score/cpu/sh/rtems/Makefile.in index f5eb7680c9..71d7e66c5b 100644 --- a/c/src/exec/score/cpu/sh/rtems/Makefile.in +++ b/c/src/exec/score/cpu/sh/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/sh/rtems +top_builddir = ../../../.. +subdir = score/cpu/sh/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/sh/rtems/score/Makefile.in b/c/src/exec/score/cpu/sh/rtems/score/Makefile.in index 38107ac4f5..26dcbfac46 100644 --- a/c/src/exec/score/cpu/sh/rtems/score/Makefile.in +++ b/c/src/exec/score/cpu/sh/rtems/score/Makefile.in @@ -5,46 +5,52 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../../.. -subdir = c/src/exec/score/cpu/sh/rtems/score +top_builddir = ../../../../.. +subdir = score/cpu/sh/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES=cpu.h shtypes.h sh.h sh_io.h cpu_isps.h iosh7030.h -H_FILES=$(H_PIECES:%=$(srcdir)/%) +H_PIECES = cpu.h shtypes.h sh.h sh_io.h cpu_isps.h iosh7030.h +H_FILES = $(H_PIECES:%=$(srcdir)/%) # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -58,13 +64,11 @@ CLOBBER_ADDITIONS += $(BUILT_SOURCES) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -all: install-headers - -install-headers: ${H_FILES} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall -preinstall: install-headers +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/sh/wrap/Makefile.in b/c/src/exec/score/cpu/sh/wrap/Makefile.in index 9a2bf7dff5..dc1460db2d 100644 --- a/c/src/exec/score/cpu/sh/wrap/Makefile.in +++ b/c/src/exec/score/cpu/sh/wrap/Makefile.in @@ -12,48 +12,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/sh/wrap +top_builddir = ../../../.. +subdir = score/cpu/sh/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@/.. -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu cpu_asm cpu_isps -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) H_PIECES = asm.h -H_FILES=$(H_PIECES:%=$(srcdir)/../%) +H_FILES = $(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S -S_PIECES = -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -I$(srcdir)/.. -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -65,8 +71,8 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) - $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) + $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) @@ -74,11 +80,11 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/sparc/Makefile.in b/c/src/exec/score/cpu/sparc/Makefile.in index b21a928cf4..f67c8f5674 100644 --- a/c/src/exec/score/cpu/sparc/Makefile.in +++ b/c/src/exec/score/cpu/sparc/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/cpu/sparc +top_builddir = ../../.. +subdir = score/cpu/sparc -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = rtems wrap -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/sparc/rtems/Makefile.in b/c/src/exec/score/cpu/sparc/rtems/Makefile.in index b838f6aabc..b45baa7f32 100644 --- a/c/src/exec/score/cpu/sparc/rtems/Makefile.in +++ b/c/src/exec/score/cpu/sparc/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/sparc/rtems +top_builddir = ../../../.. +subdir = score/cpu/sparc/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/sparc/rtems/score/Makefile.in b/c/src/exec/score/cpu/sparc/rtems/score/Makefile.in index 6bd1a5e05d..4f0f97e28d 100644 --- a/c/src/exec/score/cpu/sparc/rtems/score/Makefile.in +++ b/c/src/exec/score/cpu/sparc/rtems/score/Makefile.in @@ -5,46 +5,52 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../../.. -subdir = c/src/exec/score/cpu/sparc/rtems/score +top_builddir = ../../../../.. +subdir = score/cpu/sparc/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES=cpu.h sparctypes.h sparc.h -H_FILES=$(H_PIECES:%=$(srcdir)/%) +H_PIECES = cpu.h sparctypes.h sparc.h +H_FILES = $(H_PIECES:%=$(srcdir)/%) # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -58,13 +64,11 @@ CLOBBER_ADDITIONS += $(BUILT_SOURCES) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -all: install-headers - -install-headers: ${H_FILES} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall -preinstall: install-headers +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/sparc/wrap/Makefile.in b/c/src/exec/score/cpu/sparc/wrap/Makefile.in index 143457b27d..996544f756 100644 --- a/c/src/exec/score/cpu/sparc/wrap/Makefile.in +++ b/c/src/exec/score/cpu/sparc/wrap/Makefile.in @@ -12,48 +12,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/sparc/wrap +top_builddir = ../../../.. +subdir = score/cpu/sparc/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@/.. -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) H_PIECES = asm.h erc32.h -H_FILES=$(H_PIECES:%=$(srcdir)/../%) +H_FILES = $(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S S_PIECES = cpu_asm -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -I$(srcdir)/.. -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -65,8 +71,8 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) - $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) + $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) @@ -74,11 +80,11 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/unix/Makefile.in b/c/src/exec/score/cpu/unix/Makefile.in index 04ed540667..99ba94a777 100644 --- a/c/src/exec/score/cpu/unix/Makefile.in +++ b/c/src/exec/score/cpu/unix/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/cpu/unix +top_builddir = ../../.. +subdir = score/cpu/unix -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = rtems wrap -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/unix/rtems/Makefile.in b/c/src/exec/score/cpu/unix/rtems/Makefile.in index d1ee822eae..7c1f9708c7 100644 --- a/c/src/exec/score/cpu/unix/rtems/Makefile.in +++ b/c/src/exec/score/cpu/unix/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/unix/rtems +top_builddir = ../../../.. +subdir = score/cpu/unix/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/unix/rtems/score/Makefile.in b/c/src/exec/score/cpu/unix/rtems/score/Makefile.in index cc9a50a434..c6b6629666 100644 --- a/c/src/exec/score/cpu/unix/rtems/score/Makefile.in +++ b/c/src/exec/score/cpu/unix/rtems/score/Makefile.in @@ -5,53 +5,60 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../../.. -subdir = c/src/exec/score/cpu/unix/rtems/score +top_builddir = ../../../../.. +subdir = score/cpu/unix/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ +GENSIZE = $(PROJECT_ROOT)/tools/cpu/unix/gensize + BUILT_SOURCES = unixsize.h # C source names, if any, go here -- minus the .c -C_PIECES= -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES=cpu.h unixtypes.h unix.h -H_FILES=$(H_PIECES:%=$(srcdir)/%) unixsize.h +H_PIECES = cpu.h unixtypes.h unix.h +H_FILES = $(H_PIECES:%=$(srcdir)/%) unixsize.h # Assembly source names, if any, go here -- minus the .S -S_PIECES= -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += unixsize.h: $(GENSIZE) cpu.h $(RM) $@ $(GENSIZE) > $@ - $(CHMOD) -w $@ # # Add your list of files to delete here. The config files @@ -65,13 +72,11 @@ CLOBBER_ADDITIONS += $(BUILT_SOURCES) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -all: install-headers - -install-headers: ${H_FILES} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall -preinstall: install-headers +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/cpu/unix/wrap/Makefile.in b/c/src/exec/score/cpu/unix/wrap/Makefile.in index 4de8ca14bd..9cdf4abdc9 100644 --- a/c/src/exec/score/cpu/unix/wrap/Makefile.in +++ b/c/src/exec/score/cpu/unix/wrap/Makefile.in @@ -12,48 +12,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/cpu/unix/wrap +top_builddir = ../../../.. +subdir = score/cpu/unix/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@/.. -RELS=../$(ARCH)/rtems-cpu.rel +RELS = ../$(ARCH)/rtems-cpu.rel # C source names, if any, go here -- minus the .c C_PIECES = cpu -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES = -H_FILES=$(H_PIECES:%=$(srcdir)/../%) +H_PIECES = +H_FILES = $(H_PIECES:%=$(srcdir)/../%) # Assembly source names, if any, go here -- minus the .S -S_PIECES = -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = +S_FILES = $(S_PIECES:%=%.S) +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) -SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) +OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # (OPTIONAL) Add local stuff here using += # -DEFINES += -DCPU_SYNC_IO $(LIBC_DEFINES) +DEFINES += -DCPU_SYNC_IO $(LIBC_DEFINES) CPPFLAGS += -I$(srcdir)/.. -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) -LD_PATHS += -LD_LIBS += -LDFLAGS += +LD_PATHS += +LD_LIBS += +LDFLAGS += # # Add your list of files to delete here. The config files @@ -65,7 +71,7 @@ LDFLAGS += CLEAN_ADDITIONS += ../$(ARCH) CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS) +all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS) ../$(ARCH)/rtems-cpu.rel: $(OBJS) test -d ../$(ARCH) || mkdir ../$(ARCH) @@ -73,11 +79,11 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) -install: all +install: all preinstall: ${ARCH} - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/include/Makefile.in b/c/src/exec/score/include/Makefile.in index 9b153469b1..e4592afa71 100644 --- a/c/src/exec/score/include/Makefile.in +++ b/c/src/exec/score/include/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/score/include +top_builddir = ../.. +subdir = score/include -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=rtems +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/include/rtems/Makefile.in b/c/src/exec/score/include/rtems/Makefile.in index dfa5548186..edc41b25ac 100644 --- a/c/src/exec/score/include/rtems/Makefile.in +++ b/c/src/exec/score/include/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/include/rtems +top_builddir = ../../.. +subdir = score/include/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=wrap score +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = wrap score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/include/rtems/score/Makefile.in b/c/src/exec/score/include/rtems/score/Makefile.in index ca39cac589..87066d913b 100644 --- a/c/src/exec/score/include/rtems/score/Makefile.in +++ b/c/src/exec/score/include/rtems/score/Makefile.in @@ -5,37 +5,39 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/include/rtems/score +top_builddir = ../../../.. +subdir = score/include/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # We only build multiprocessing related files if HAS_MP was defined -MP_PIECES_yes_V = mpci mppkt objectmp threadmp -MP_PIECES = $(MP_PIECES_$(HAS_MP)_V) +MP_H_PIECES_yes_V = mpci mppkt objectmp threadmp +MP_H_PIECES = $(MP_H_PIECES_$(HAS_MP)_V) # H_FILES that get installed in the rtems/score subdirectoy -H_PIECES= address apiext bitfield chain context copyrt coremsg coremutex \ - coresem heap interr isr object \ - priority stack states sysstate thread threadq \ - tod tqdata userext watchdog wkspace +H_PIECES = address apiext bitfield chain context copyrt coremsg coremutex \ + coresem heap interr isr object priority stack states sysstate thread \ + threadq tod tqdata userext watchdog wkspace $(MP_H_PIECES) +H_FILES = $(H_PIECES:%=$(srcdir)/%.h) +TARGOPTS = targopts.h -# Use this if compilation in location will be supported -# H_FILES=$(H_PIECES:%=$(srcdir)/%.h) targopts.h +SRCS = $(H_FILES) $(TARGOPTS) -# FIXME: Work-around -H_FILES=$(H_PIECES:%=$(srcdir)/%.h) -TARGOPTS=$(PROJECT_INCLUDE)/rtems/score/targopts.h +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(RTEMS_ROOT)/make/leaf.cfg -SRCS=$(H_FILES) $(TARGOPTS) +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg -include $(RTEMS_ROOT)/make/leaf.cfg +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + +RTEMS_USE_NEWLIB = @RTEMS_USE_NEWLIB@ # # Add your list of files to delete here. The config files @@ -54,10 +56,10 @@ CLOBBER_ADDITIONS += # gcc cpp predefines eliminate the need for RTEMS_CPU_MODEL # on some families but not on others. For example, the i386 # family does not give us enough information from the predefines. -RTEMS_CPU_DEFINED=$(subst .,_,$(RTEMS_CPU)) +RTEMS_CPU_DEFINED = $(subst .,_,$(RTEMS_CPU)) # make the target dependent options file -$(TARGOPTS): +$(TARGOPTS): @echo "/* target board dependent options file */" >$@ @echo "/* automatically generated -- DO NOT EDIT!! */" >>$@ @echo >>$@ @@ -74,34 +76,36 @@ $(TARGOPTS): @echo "#endif" >>$@ @echo "#define $(RTEMS_CPU_MODEL) 1" >>$@ @echo >>$@ - @echo "#ifdef ${RTEMS_BSP}" >>$@ - @echo "#undef ${RTEMS_BSP}" >>$@ + @echo "#ifdef @RTEMS_BSP@" >>$@ + @echo "#undef @RTEMS_BSP@" >>$@ @echo "#endif" >>$@ - @echo "#define ${RTEMS_BSP} 1" >>$@ + @echo "#define @RTEMS_BSP@ 1" >>$@ @echo >>$@ @$(make-target-options) -ifeq (${RTEMS_USE_MACROS},yes) - @echo "#define USE_MACROS 1" >>$@ -else - @echo "#define USE_INLINES 1" >>$@ -endif -ifeq ($(HAS_MULTIPROCESSING),yes) - @echo "#define RTEMS_MULTIPROCESSING 1" >>$@ -endif -ifeq ($(HAS_POSIX_API),yes) - @echo "#define RTEMS_POSIX_API 1" >>$@ -endif -ifeq ($(RTEMS_USE_NEWLIB),yes) - @echo "#define RTEMS_NEWLIB 1" >>$@ - @echo "#define MALLOC_PROVIDED 1" >>$@ -endif + @if test "$(RTEMS_USE_MACROS)" = "yes"; then \ + echo "#define USE_MACROS 1" >>$@; \ + else \ + echo "#define USE_INLINES 1" >>$@; \ + fi + if test "$(HAS_MP)" = "yes"; then \ + echo "#define RTEMS_MULTIPROCESSING 1" >>$@; \ + fi + @if test "$(HAS_POSIX_API)" = "yes"; then \ + echo "#define RTEMS_POSIX_API 1" >>$@; \ + fi + @if test "$(RTEMS_USE_NEWLIB)" = "yes"; then \ + echo "#define RTEMS_NEWLIB 1" >>$@; \ + echo "#define MALLOC_PROVIDED 1" >>$@; \ + fi @echo >>$@ @echo "#endif" >>$@ - @chmod 755 $@ -all: $(SRCS) - $(INSTALL_CHANGE) ${H_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall + +preinstall: $(INSTALLDIRS) $(H_FILES) $(TARGOPTS) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score + @$(INSTALL_CHANGE) -m 644 $(TARGOPTS) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/include/rtems/wrap/Makefile.in b/c/src/exec/score/include/rtems/wrap/Makefile.in index 3d5299e7b4..3a03ce1e3b 100644 --- a/c/src/exec/score/include/rtems/wrap/Makefile.in +++ b/c/src/exec/score/include/rtems/wrap/Makefile.in @@ -5,27 +5,35 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/include/rtems/wrap +top_builddir = ../../../.. +subdir = score/include/rtems/wrap -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -H_PIECES=debug system -H_FILES=$(H_PIECES:%=$(srcdir)/../%.h) +H_PIECES = debug system +H_FILES = $(H_PIECES:%=$(srcdir)/../%.h) -SRCS=$(H_FILES) +SRCS = $(H_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + +all: preinstall + +preinstall: $(INSTALLDIRS) $(H_FILES) + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/inline/Makefile.in b/c/src/exec/score/inline/Makefile.in index 5b2a203a74..0210b0bc66 100644 --- a/c/src/exec/score/inline/Makefile.in +++ b/c/src/exec/score/inline/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/score/inline +top_builddir = ../.. +subdir = score/inline -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=rtems +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/inline/rtems/Makefile.in b/c/src/exec/score/inline/rtems/Makefile.in index 76e6134f17..520bce6a7c 100644 --- a/c/src/exec/score/inline/rtems/Makefile.in +++ b/c/src/exec/score/inline/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/inline/rtems +top_builddir = ../../.. +subdir = score/inline/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=score +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/inline/rtems/score/Makefile.in b/c/src/exec/score/inline/rtems/score/Makefile.in index d8214e9f7d..df86b07bb4 100644 --- a/c/src/exec/score/inline/rtems/score/Makefile.in +++ b/c/src/exec/score/inline/rtems/score/Makefile.in @@ -5,30 +5,36 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/inline/rtems/score +top_builddir = ../../../.. +subdir = score/inline/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # We only build multiprocessing related files if HAS_MP was defined -MP_PIECES_yes_V = mppkt objectmp threadmp -MP_PIECES = $(MP_PIECES_$(HAS_MP)_V) +MP_I_PIECES_yes_V = mppkt objectmp threadmp +MP_I_PIECES = $(MP_I_PIECES_$(HAS_MP)_V) -I_PIECES= address chain coremsg coremutex coresem heap \ - isr object priority stack states sysstate thread \ - tod tqdata userext watchdog wkspace $(MP_PIECES) -I_FILES=$(I_PIECES:%=$(srcdir)/%.inl) +I_PIECES = address chain coremsg coremutex coresem heap isr object priority \ + stack states sysstate thread tod tqdata userext watchdog wkspace \ + $(MP_I_PIECES) +I_FILES = $(I_PIECES:%=$(srcdir)/%.inl) -SRCS=$(I_FILES) +SRCS = $(I_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # Add your list of files to delete here. The config files # already know how to delete some stuff, so you may want @@ -39,9 +45,11 @@ include $(RTEMS_ROOT)/make/lib.cfg CLEAN_ADDITIONS += $(LIB) CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/score +all: preinstall + +preinstall: $(INSTALLDIRS) $(I_FILES) + @$(INSTALL_CHANGE) -m 644 $(I_FILES) $(PROJECT_INCLUDE)/rtems/score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/macros/Makefile.in b/c/src/exec/score/macros/Makefile.in index 796828cfed..a60ab196cd 100644 --- a/c/src/exec/score/macros/Makefile.in +++ b/c/src/exec/score/macros/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/score/macros +top_builddir = ../.. +subdir = score/macros -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=rtems +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = rtems -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/macros/rtems/Makefile.in b/c/src/exec/score/macros/rtems/Makefile.in index a4d99daa67..8a13cb6816 100644 --- a/c/src/exec/score/macros/rtems/Makefile.in +++ b/c/src/exec/score/macros/rtems/Makefile.in @@ -5,21 +5,21 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/exec/score/macros/rtems +top_builddir = ../../.. +subdir = score/macros/rtems -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/directory.cfg -SUB_DIRS=score +INSTALL_CHANGE = @INSTALL_CHANGE@ + +SUB_DIRS = score -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/macros/rtems/score/Makefile.in b/c/src/exec/score/macros/rtems/score/Makefile.in index b8dba0da00..61969f5f43 100644 --- a/c/src/exec/score/macros/rtems/score/Makefile.in +++ b/c/src/exec/score/macros/rtems/score/Makefile.in @@ -5,30 +5,36 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/exec/score/macros/rtems/score +top_builddir = ../../../.. +subdir = score/macros/rtems/score -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # We only build multiprocessing related files if HAS_MP was defined -MP_PIECES_yes_V = mppkt objectmp threadmp -MP_PIECES = $(MP_PIECES_$(HAS_MP)_V) +MP_I_PIECES_yes_V = mppkt objectmp threadmp +MP_I_PIECES = $(MP_I_PIECES_$(HAS_MP)_V) -I_PIECES= address chain coremsg coremutex coresem heap \ - isr object priority stack states sysstate thread \ - tod tqdata userext watchdog wkspace $(MP_PIECES) -I_FILES=$(I_PIECES:%=$(srcdir)/%.inl) +I_PIECES = address chain coremsg coremutex coresem heap isr object priority \ + stack states sysstate thread tod tqdata userext watchdog wkspace \ + $(MP_I_PIECES) +I_FILES = $(I_PIECES:%=$(srcdir)/%.inl) -SRCS=$(I_FILES) +SRCS = $(I_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + # # Add your list of files to delete here. The config files # already know how to delete some stuff, so you may want @@ -39,9 +45,11 @@ include $(RTEMS_ROOT)/make/lib.cfg CLEAN_ADDITIONS += $(LIB) CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/score +preinstall: $(INSTALLDIRS) $(I_FILES) + @$(INSTALL_CHANGE) -m 644 $(I_FILES) $(PROJECT_INCLUDE)/rtems/score + +all: preinstall -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/score/src/Makefile.in b/c/src/exec/score/src/Makefile.in index fb238d0855..e7028aa3d6 100644 --- a/c/src/exec/score/src/Makefile.in +++ b/c/src/exec/score/src/Makefile.in @@ -5,51 +5,48 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/exec/score/src +top_builddir = ../.. +subdir = score/src -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ # We only build multiprocessing related files if HAS_MP was defined -MP_PIECES_yes_V = mpci objectmp threadmp -MP_PIECES = $(MP_PIECES_$(HAS_MP)_V) +MP_C_PIECES_yes_V = mpci objectmp threadmp +MP_C_PIECES = $(MP_C_PIECES_$(HAS_MP)_V) -THREAD_PIECES=\ - thread threadchangepriority threadclearstate threadclose \ - threadcreateidle threaddelayended threaddispatch \ - threadevaluatemode threadget threadhandler \ - threadidlebody threadinitialize threadloadenv \ - threadready threadresettimeslice threadrestart \ - threadsetpriority threadsetstate threadsettransient \ - threadstackallocate threadstackfree threadstart \ - threadstartmultitasking threadtickletimeslice \ +THREAD_C_PIECES = thread threadchangepriority threadclearstate threadclose \ + threadcreateidle threaddelayended threaddispatch threadevaluatemode \ + threadget threadhandler threadidlebody threadinitialize threadloadenv \ + threadready threadresettimeslice threadrestart threadsetpriority \ + threadsetstate threadsettransient threadstackallocate threadstackfree \ + threadstart threadstartmultitasking threadtickletimeslice \ threadyieldprocessor # C and C++ source names, if any, go here -- minus the .c or .cc -C_PIECES=apiext chain coremsg coremutex coresem coretod heap interr \ - isr object $(THREAD_PIECES) threadq userext \ - watchdog wkspace $(MP_PIECES) -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = apiext chain coremsg coremutex coresem coretod heap interr isr \ + object $(THREAD_C_PIECES) threadq userext watchdog wkspace \ + $(MP_C_PIECES) +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -SRCS=$(C_FILES) -OBJS=$(C_O_FILES) +SRCS = $(C_FILES) +OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # Add local stuff here using += # -DEFINES += -D__RTEMS_INSIDE__ +DEFINES += -D__RTEMS_INSIDE__ CPPFLAGS += -CFLAGS += $(CFLAGS_OS_V) +CFLAGS += $(CFLAGS_OS_V) # # Add your list of files to delete here. The config files @@ -58,11 +55,11 @@ CFLAGS += $(CFLAGS_OS_V) # 'make clobber' already includes 'make clean' # -CLEAN_ADDITIONS += +CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) ${OBJS} +all: ${ARCH} $(SRCS) ${OBJS} -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status |