diff options
Diffstat (limited to '')
-rw-r--r-- | c/src/lib/libbsp/sparc/Makefile.in | 16 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/erc32/Makefile.in | 17 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/erc32/clock/Makefile.in | 48 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/erc32/console/Makefile.in | 48 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/erc32/gnatsupp/Makefile.in | 46 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/erc32/include/Makefile.in | 26 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/erc32/start/Makefile.in | 48 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/erc32/startsis/Makefile.in | 48 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/erc32/startup/Makefile.in | 55 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/erc32/timer/Makefile.in | 48 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/erc32/tools/Makefile.am | 8 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/erc32/tools/Makefile.in | 27 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/erc32/tools/aclocal.m4 | 89 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/erc32/tools/configure | 116 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/erc32/tools/configure.in | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.in | 50 |
16 files changed, 434 insertions, 260 deletions
diff --git a/c/src/lib/libbsp/sparc/Makefile.in b/c/src/lib/libbsp/sparc/Makefile.in index 8607725718..a939133fd5 100644 --- a/c/src/lib/libbsp/sparc/Makefile.in +++ b/c/src/lib/libbsp/sparc/Makefile.in @@ -5,22 +5,22 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../.. -subdir = c/src/lib/libbsp/sparc +top_builddir = ../.. +subdir = libbsp/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@ + # Descend into the $(RTEMS_BSP_FAMILY) directory -SUB_DIRS=$(RTEMS_BSP_FAMILY) +SUB_DIRS = $(RTEMS_BSP_FAMILY) -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/lib/libbsp/sparc/erc32/Makefile.in b/c/src/lib/libbsp/sparc/erc32/Makefile.in index f0a7e4b074..f4088cd8fc 100644 --- a/c/src/lib/libbsp/sparc/erc32/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/Makefile.in @@ -5,23 +5,24 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../.. -subdir = c/src/lib/libbsp/sparc/erc32 +top_builddir = ../../.. +subdir = libbsp/sparc/erc32 -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@ + # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUB_DIRS=startsis include startup gnatsupp console clock timer wrapup tools +SUB_DIRS = startsis include startup gnatsupp console clock timer wrapup \ + tools -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/lib/libbsp/sparc/erc32/clock/Makefile.in b/c/src/lib/libbsp/sparc/erc32/clock/Makefile.in index a5fc77d6d3..b1ffacc7fc 100644 --- a/c/src/lib/libbsp/sparc/erc32/clock/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/clock/Makefile.in @@ -5,47 +5,47 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/sparc/erc32/clock +top_builddir = ../../../.. +subdir = libbsp/sparc/erc32/clock -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/clock.rel +PGM = ${ARCH}/clock.rel # C source names, if any, go here -- minus the .c -C_PIECES=ckinit -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = ckinit +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # 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@ + # # (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 @@ -60,11 +60,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -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/lib/libbsp/sparc/erc32/console/Makefile.in b/c/src/lib/libbsp/sparc/erc32/console/Makefile.in index 44e9ca15fd..95292d3639 100644 --- a/c/src/lib/libbsp/sparc/erc32/console/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/console/Makefile.in @@ -5,47 +5,47 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/sparc/erc32/console +top_builddir = ../../../.. +subdir = libbsp/sparc/erc32/console -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/console.rel +PGM = ${ARCH}/console.rel # C source names, if any, go here -- minus the .c -C_PIECES=console consolereserveresources debugputs -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = console consolereserveresources debugputs +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # 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@ + # # (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 @@ -60,11 +60,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -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/lib/libbsp/sparc/erc32/gnatsupp/Makefile.in b/c/src/lib/libbsp/sparc/erc32/gnatsupp/Makefile.in index 04711abfaa..6f00329a01 100644 --- a/c/src/lib/libbsp/sparc/erc32/gnatsupp/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/gnatsupp/Makefile.in @@ -5,47 +5,47 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/sparc/erc32/gnatsupp +top_builddir = ../../../.. +subdir = libbsp/sparc/erc32/gnatsupp -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@:@srcdir@/../../../shared -PGM=${ARCH}/gnatsupp.rel +PGM = ${ARCH}/gnatsupp.rel # C source names, if any, go here -- minus the .c -C_PIECES=gnatsupp -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = gnatsupp +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # 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) +SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_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/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (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 @@ -60,8 +60,8 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) -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/lib/libbsp/sparc/erc32/include/Makefile.in b/c/src/lib/libbsp/sparc/erc32/include/Makefile.in index 963f81cfad..9077402a73 100644 --- a/c/src/lib/libbsp/sparc/erc32/include/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/include/Makefile.in @@ -5,12 +5,10 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/sparc/erc32/include +top_builddir = ../../../.. +subdir = libbsp/sparc/erc32/include -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ @@ -30,17 +28,25 @@ H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h EQ_FILES = -SRCS=$(H_FILES) $(EQ_FILES) +SRCS = $(H_FILES) $(EQ_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) + CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE) +all: $(SRCS) + @$(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/lib/libbsp/sparc/erc32/start/Makefile.in b/c/src/lib/libbsp/sparc/erc32/start/Makefile.in index e769e74770..b0ad9e2844 100644 --- a/c/src/lib/libbsp/sparc/erc32/start/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/start/Makefile.in @@ -5,47 +5,47 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/sparc/erc32/startsis +top_builddir = ../../../.. +subdir = libbsp/sparc/erc32/startsis -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGMS=${ARCH}/startsis.o +PGMS = ${ARCH}/startsis.o # 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_FILES= +H_FILES = # Assembly source names, if any, go here -- minus the .S -S_PIECES=startsis -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = startsis +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@ + # # (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 @@ -57,9 +57,9 @@ LDFLAGS += CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) $(OBJS) $(PGM) - $(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(OBJS) $(PGM) + $(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib -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/lib/libbsp/sparc/erc32/startsis/Makefile.in b/c/src/lib/libbsp/sparc/erc32/startsis/Makefile.in index e769e74770..b0ad9e2844 100644 --- a/c/src/lib/libbsp/sparc/erc32/startsis/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/startsis/Makefile.in @@ -5,47 +5,47 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/sparc/erc32/startsis +top_builddir = ../../../.. +subdir = libbsp/sparc/erc32/startsis -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGMS=${ARCH}/startsis.o +PGMS = ${ARCH}/startsis.o # 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_FILES= +H_FILES = # Assembly source names, if any, go here -- minus the .S -S_PIECES=startsis -S_FILES=$(S_PIECES:%=%.S) -S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) +S_PIECES = startsis +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@ + # # (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 @@ -57,9 +57,9 @@ LDFLAGS += CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: ${ARCH} $(SRCS) $(OBJS) $(PGM) - $(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(OBJS) $(PGM) + $(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib -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/lib/libbsp/sparc/erc32/startup/Makefile.in b/c/src/lib/libbsp/sparc/erc32/startup/Makefile.in index 2ed43a0fbb..366e515b4d 100644 --- a/c/src/lib/libbsp/sparc/erc32/startup/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/startup/Makefile.in @@ -5,47 +5,54 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/sparc/erc32/startup +top_builddir = ../../../.. +subdir = libbsp/sparc/erc32/startup -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@:@srcdir@/../../../shared -PGM=${ARCH}/startup.rel +PGM = ${ARCH}/startup.rel # C source names, if any, go here -- minus the .c -C_PIECES=bspclean bsplibc bsppost bspstart main bootcard sbrk setvec spurious -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = bspclean bsplibc bsppost bspstart main bootcard sbrk setvec \ + spurious +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # 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=linkcmds $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) +SRCS = linkcmds $(C_FILES) $(CC_FILES) $(H_FILES) $(S_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/leaf.cfg +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_RELEASE)/lib + +$(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 @@ -60,9 +67,9 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) - $(INSTALL_CHANGE) $(srcdir)/linkcmds ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(PGM) + $(INSTALL_CHANGE) $(srcdir)/linkcmds $(PROJECT_RELEASE)/lib -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/lib/libbsp/sparc/erc32/timer/Makefile.in b/c/src/lib/libbsp/sparc/erc32/timer/Makefile.in index 90eb5af4ef..063015e472 100644 --- a/c/src/lib/libbsp/sparc/erc32/timer/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/timer/Makefile.in @@ -5,47 +5,47 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/sparc/erc32/timer +top_builddir = ../../../.. +subdir = libbsp/sparc/erc32/timer -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -PGM=${ARCH}/timer.rel +PGM = ${ARCH}/timer.rel # C source names, if any, go here -- minus the .c -C_PIECES=timer -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) +C_PIECES = timer +C_FILES = $(C_PIECES:%=%.c) +C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_FILES= +H_FILES = # 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@ + # # (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 @@ -60,11 +60,11 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -install: all +install: all -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/lib/libbsp/sparc/erc32/tools/Makefile.am b/c/src/lib/libbsp/sparc/erc32/tools/Makefile.am index 3df9db08c5..ab312bdded 100644 --- a/c/src/lib/libbsp/sparc/erc32/tools/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/tools/Makefile.am @@ -2,14 +2,14 @@ # $Id$ # -AUTOMAKE_OPTIONS = foreign -ACLOCAL = @ACLOCAL@ -I $(RTEMS_TOPdir)/aclocal +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal noinst_SCRIPTS=runtest #HACK: install to build-tree all-local: $(SCRIPTS) - $(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/tests - $(INSTALL_SCRIPT) runtest $(PROJECT_ROOT)/${RTEMS_BSP}/tests/runtest + $(mkinstalldirs) $(PROJECT_ROOT)/erc32/tests + $(INSTALL_SCRIPT) runtest $(PROJECT_ROOT)/erc32/tests/runtest include $(top_srcdir)/../../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/sparc/erc32/tools/Makefile.in b/c/src/lib/libbsp/sparc/erc32/tools/Makefile.in index 0c980e7778..c256d2bc74 100644 --- a/c/src/lib/libbsp/sparc/erc32/tools/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/tools/Makefile.in @@ -44,6 +44,8 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . + +ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ @@ -66,17 +68,26 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ +INSTALL_CHANGE = @INSTALL_CHANGE@ KSH = @KSH@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ +PACKHEX = @PACKHEX@ PROJECT_ROOT = @PROJECT_ROOT@ RTEMS_CPU = @RTEMS_CPU@ RTEMS_ROOT = @RTEMS_ROOT@ RTEMS_TOPdir = @RTEMS_TOPdir@ VERSION = @VERSION@ +project_bindir = @project_bindir@ +project_includedir = @project_includedir@ +project_libdir = @project_libdir@ +rtems_bspdir = @rtems_bspdir@ +rtems_makedir = @rtems_makedir@ +tooldir = @tooldir@ -AUTOMAKE_OPTIONS = foreign -ACLOCAL = @ACLOCAL@ -I $(RTEMS_TOPdir)/aclocal +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal noinst_SCRIPTS = runtest ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -94,19 +105,19 @@ TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/../../../../../../../automake/local.am +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/../../../../../../../automake/local.am cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(ACLOCAL_M4): configure.in - cd $(srcdir) && $(ACLOCAL) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) runtest: $(top_builddir)/config.status runtest.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -232,8 +243,8 @@ mostlyclean distclean maintainer-clean #HACK: install to build-tree all-local: $(SCRIPTS) - $(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/tests - $(INSTALL_SCRIPT) runtest $(PROJECT_ROOT)/${RTEMS_BSP}/tests/runtest + $(mkinstalldirs) $(PROJECT_ROOT)/erc32/tests + $(INSTALL_SCRIPT) runtest $(PROJECT_ROOT)/erc32/tests/runtest debug-am: debug: debug-am diff --git a/c/src/lib/libbsp/sparc/erc32/tools/aclocal.m4 b/c/src/lib/libbsp/sparc/erc32/tools/aclocal.m4 index 0f2b9f3276..c18d0a0b2d 100644 --- a/c/src/lib/libbsp/sparc/erc32/tools/aclocal.m4 +++ b/c/src/lib/libbsp/sparc/erc32/tools/aclocal.m4 @@ -27,10 +27,6 @@ TARGET_SUBDIR=".") RTEMS_TOPdir="$1"; AC_SUBST(RTEMS_TOPdir) -PROJECT_ROOT=`pwd`/$RTEMS_TOPdir; -test "$TARGET_SUBDIR" = "." || PROJECT_ROOT="$PROJECT_ROOT/.." -AC_SUBST(PROJECT_ROOT) - dnl Determine RTEMS Version string from the VERSION file dnl Hopefully, Joel never changes its format ;- AC_MSG_CHECKING([for RTEMS Version]) @@ -46,9 +42,6 @@ if test -z "$RTEMS_VERSION"; then AC_MSG_ERROR(Unable to determine version) fi AC_MSG_RESULT($RTEMS_VERSION) - -RTEMS_ROOT='$(top_srcdir)'/$RTEMS_TOPdir; -AC_SUBST(RTEMS_ROOT) ])dnl dnl @@ -184,6 +177,39 @@ else fi AC_SUBST($1)]) +# Add --enable-maintainer-mode option to configure. +# From Jim Meyering + +# serial 1 + +AC_DEFUN(AM_MAINTAINER_MODE, +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT($USE_MAINTAINER_MODE) + AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) + +# Define a conditional. + +AC_DEFUN(AM_CONDITIONAL, +[AC_SUBST($1_TRUE) +AC_SUBST($1_FALSE) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi]) + dnl $Id$ AC_DEFUN(RTEMS_PATH_KSH, @@ -199,3 +225,52 @@ AC_MSG_ERROR( fi ]) +dnl +dnl $Id$ +dnl + +AC_DEFUN(RTEMS_PROJECT_ROOT, +[dnl +AC_REQUIRE([RTEMS_TOP]) +if test "$TARGET_SUBDIR" = "." ; then +PROJECT_ROOT=$RTEMS_TOPdir/'$(top_builddir)'; +else +PROJECT_ROOT=../$RTEMS_TOPdir/'$(top_builddir)' +fi +AC_SUBST(PROJECT_ROOT) + +RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c/$RTEMS_BSP +AC_SUBST(RTEMS_ROOT) + +INSTALL_CHANGE="\$(KSH) \$(PROJECT_ROOT)/tools/build/install-if-change" +AC_SUBST(INSTALL_CHANGE) + +PACKHEX="\$(PROJECT_ROOT)/tools/build/packhex" +AC_SUBST(PACKHEX) +]) + + +AC_DEFUN(RTEMS_TOOLPATHS, +[ +# tooldir='$(exec_prefix)/'$target_alias +# Temporary work-around until building in source tree is supported +AC_REQUIRE([RTEMS_PROJECT_ROOT]) + +tooldir='$(PROJECT_ROOT)' +AC_SUBST(tooldir) + +project_includedir='$(tooldir)'/include +AC_SUBST(project_includedir) + +project_libdir='$(tooldir)/lib$(MULTISUBDIR)' +AC_SUBST(project_libdir) + +project_bindir='$(tooldir)/bin' +AC_SUBST(project_bindir) + +rtems_bspdir='$(prefix)/${RTEMS_BSP}' +AC_SUBST(rtems_bspdir) +rtems_makedir='$(prefix)/make' +AC_SUBST(rtems_makedir) +]) + diff --git a/c/src/lib/libbsp/sparc/erc32/tools/configure b/c/src/lib/libbsp/sparc/erc32/tools/configure index b810c96a97..7a948a1f51 100644 --- a/c/src/lib/libbsp/sparc/erc32/tools/configure +++ b/c/src/lib/libbsp/sparc/erc32/tools/configure @@ -13,6 +13,9 @@ ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help --with-target-subdir=DIR" +ac_help="$ac_help + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -555,12 +558,8 @@ fi RTEMS_TOPdir="../../../../../../.."; -PROJECT_ROOT=`pwd`/$RTEMS_TOPdir; -test "$TARGET_SUBDIR" = "." || PROJECT_ROOT="$PROJECT_ROOT/.." - - echo $ac_n "checking for RTEMS Version""... $ac_c" 1>&6 -echo "configure:564: checking for RTEMS Version" >&5 +echo "configure:563: checking for RTEMS Version" >&5 if test -r "${srcdir}/${RTEMS_TOPdir}/VERSION"; then RTEMS_VERSION=`grep Version ${srcdir}/${RTEMS_TOPdir}/VERSION | \ sed -e 's%RTEMS[ ]*Version[ ]*\(.*\)[ ]*%\1%g'` @@ -572,9 +571,6 @@ if test -z "$RTEMS_VERSION"; then fi echo "$ac_t""$RTEMS_VERSION" 1>&6 -RTEMS_ROOT='$(top_srcdir)'/$RTEMS_TOPdir; - - # Do some error checking and defaulting for the host and target type. @@ -604,7 +600,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:608: checking host system type" >&5 +echo "configure:604: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -625,7 +621,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:629: checking target system type" >&5 +echo "configure:625: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -643,7 +639,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:647: checking build system type" >&5 +echo "configure:643: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -666,7 +662,7 @@ test "$host_alias" != "$target_alias" && program_prefix=${target_alias}- echo $ac_n "checking rtems target cpu""... $ac_c" 1>&6 -echo "configure:670: checking rtems target cpu" >&5 +echo "configure:666: checking rtems target cpu" >&5 case "${target}" in # hpux unix port should go here i[3456]86-go32-rtems*) @@ -704,7 +700,7 @@ echo "$ac_t""$RTEMS_CPU" 1>&6 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:708: checking for a BSD compatible install" >&5 +echo "configure:704: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -757,7 +753,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:761: checking whether build environment is sane" >&5 +echo "configure:757: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -814,7 +810,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:818: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:814: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -853,7 +849,7 @@ fi missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:857: checking for working aclocal" >&5 +echo "configure:853: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -866,7 +862,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:870: checking for working autoconf" >&5 +echo "configure:866: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -879,7 +875,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:883: checking for working automake" >&5 +echo "configure:879: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -892,7 +888,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:896: checking for working autoheader" >&5 +echo "configure:892: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -905,7 +901,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:909: checking for working makeinfo" >&5 +echo "configure:905: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -918,6 +914,29 @@ else fi +echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 +echo "configure:919: checking whether to enable maintainer-specific portions of Makefiles" >&5 + # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then + enableval="$enable_maintainer_mode" + USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6 + + +if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + MAINT=$MAINTAINER_MODE_TRUE + + for ac_prog in bash ksh sh @@ -925,7 +944,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:929: checking for $ac_word" >&5 +echo "configure:948: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_KSH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -967,6 +986,46 @@ if test -z "$KSH"; then fi + +if test "$TARGET_SUBDIR" = "." ; then +PROJECT_ROOT=$RTEMS_TOPdir/'$(top_builddir)'; +else +PROJECT_ROOT=../$RTEMS_TOPdir/'$(top_builddir)' +fi + + +RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c/$RTEMS_BSP + + +INSTALL_CHANGE="\$(KSH) \$(PROJECT_ROOT)/tools/build/install-if-change" + + +PACKHEX="\$(PROJECT_ROOT)/tools/build/packhex" + + + +# tooldir='$(exec_prefix)/'$target_alias +# Temporary work-around until building in source tree is supported + + +tooldir='$(PROJECT_ROOT)' + + +project_includedir='$(tooldir)'/include + + +project_libdir='$(tooldir)/lib$(MULTISUBDIR)' + + +project_bindir='$(tooldir)/bin' + + +rtems_bspdir='$(prefix)/${RTEMS_BSP}' + +rtems_makedir='$(prefix)/make' + + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -1114,8 +1173,6 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g s%@RTEMS_TOPdir@%$RTEMS_TOPdir%g -s%@PROJECT_ROOT@%$PROJECT_ROOT%g -s%@RTEMS_ROOT@%$RTEMS_ROOT%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g @@ -1143,7 +1200,20 @@ s%@AUTOMAKE@%$AUTOMAKE%g s%@AUTOHEADER@%$AUTOHEADER%g s%@MAKEINFO@%$MAKEINFO%g s%@SET_MAKE@%$SET_MAKE%g +s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g +s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g +s%@MAINT@%$MAINT%g s%@KSH@%$KSH%g +s%@PROJECT_ROOT@%$PROJECT_ROOT%g +s%@RTEMS_ROOT@%$RTEMS_ROOT%g +s%@INSTALL_CHANGE@%$INSTALL_CHANGE%g +s%@PACKHEX@%$PACKHEX%g +s%@tooldir@%$tooldir%g +s%@project_includedir@%$project_includedir%g +s%@project_libdir@%$project_libdir%g +s%@project_bindir@%$project_bindir%g +s%@rtems_bspdir@%$rtems_bspdir%g +s%@rtems_makedir@%$rtems_makedir%g CEOF EOF diff --git a/c/src/lib/libbsp/sparc/erc32/tools/configure.in b/c/src/lib/libbsp/sparc/erc32/tools/configure.in index e83e201612..0aee4094fa 100644 --- a/c/src/lib/libbsp/sparc/erc32/tools/configure.in +++ b/c/src/lib/libbsp/sparc/erc32/tools/configure.in @@ -9,9 +9,13 @@ RTEMS_TOP(../../../../../../..) RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-lib-libbsp-sparc-erc32-tools,$RTEMS_VERSION,no) +AM_MAINTAINER_MODE RTEMS_PATH_KSH +RTEMS_PROJECT_ROOT +RTEMS_TOOLPATHS + AC_OUTPUT( Makefile runtest) diff --git a/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.in b/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.in index cfd8aafa5c..e5dd317a5e 100644 --- a/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.in @@ -5,43 +5,43 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../../../../../../.. -subdir = c/src/lib/libbsp/sparc/erc32/wrapup +top_builddir = ../../../.. +subdir = libbsp/sparc/erc32/wrapup -INSTALL = @INSTALL@ - -RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -BSP_PIECES=startup console clock timer gnatsupp +BSP_PIECES = startup console clock timer gnatsupp # pieces to pick up out of libcpu/sparc -CPU_PIECES=reg_win syscall -GENERIC_PIECES= +CPU_PIECES = reg_win syscall +GENERIC_PIECES = # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS=$(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(foreach piece, $(CPU_PIECES), \ - ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).rel) \ - $(foreach piece, $(GENERIC_PIECES), \ - ../../../$(piece)/$(ARCH)/$(piece).rel) -LIB=$(ARCH)/libbsp.a - -include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ + $(foreach piece, $(CPU_PIECES), \ + ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).rel) $(foreach \ + piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) +LIB = $(ARCH)/libbsp.a + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg +INSTALL = @INSTALL@ +INSTALL_CHANGE = @INSTALL_CHANGE@ + # # (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 @@ -56,12 +56,12 @@ CLOBBER_ADDITIONS += $(LIB): ${OBJS} $(make-library) -all: ${ARCH} $(SRCS) $(LIB) - $(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib +all: ${ARCH} $(SRCS) $(LIB) + $(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib -$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs +$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs $(INSTALL_DATA) $< $@ -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 |