diff options
52 files changed, 208 insertions, 267 deletions
diff --git a/c/src/exec/configure.in b/c/src/exec/configure.in index c0d0de3624..e31f162b92 100644 --- a/c/src/exec/configure.in +++ b/c/src/exec/configure.in @@ -69,9 +69,6 @@ fi AC_CONFIG_SUBDIRS($cfg_subdirs) AC_CONFIG_SUBDIRS(score/cpu/$RTEMS_CPU) -PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" -AC_SUBST(PROJECT_INCLUDE) - # Try to explicitly list a Makefile here AC_OUTPUT( Makefile diff --git a/c/src/exec/itron/configure.in b/c/src/exec/itron/configure.in index c1bf5e6e1c..5632736d89 100644 --- a/c/src/exec/itron/configure.in +++ b/c/src/exec/itron/configure.in @@ -57,9 +57,6 @@ if test "$RTEMS_USE_MACROS" = "yes"; then AC_MSG_ERROR(Macros are not implemented for the ITRON API) fi -PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" -AC_SUBST(PROJECT_INCLUDE) - ## ## FIXME: We configure and build the macros subdirectory, too. ## Should probably use AM_CONDITIONALs to disable them in future diff --git a/c/src/exec/posix/configure.in b/c/src/exec/posix/configure.in index 84e04baadf..a34410a8ad 100644 --- a/c/src/exec/posix/configure.in +++ b/c/src/exec/posix/configure.in @@ -63,9 +63,6 @@ if test "$RTEMS_USE_MACROS" = "yes"; then AC_MSG_ERROR(Macros are not implemented for the POSIX API) fi -PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" -AC_SUBST(PROJECT_INCLUDE) - ## ## FIXME: We configure and build the macros subdirectory, too. ## Should probably use AM_CONDITIONALs to disable them in future diff --git a/c/src/exec/score/cpu/a29k/configure.in b/c/src/exec/score/cpu/a29k/configure.in index 22f6e36c53..f3af0586e4 100644 --- a/c/src/exec/score/cpu/a29k/configure.in +++ b/c/src/exec/score/cpu/a29k/configure.in @@ -30,9 +30,6 @@ RTEMS_CHECK_NEWLIB # Check if there is custom/*.cfg for this BSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" -AC_SUBST(PROJECT_INCLUDE) - # Try to explicitly list a Makefile here AC_OUTPUT( Makefile diff --git a/c/src/exec/score/cpu/hppa1.1/configure.in b/c/src/exec/score/cpu/hppa1.1/configure.in index 7b33e6537a..9a06a53e26 100644 --- a/c/src/exec/score/cpu/hppa1.1/configure.in +++ b/c/src/exec/score/cpu/hppa1.1/configure.in @@ -30,9 +30,6 @@ RTEMS_CHECK_NEWLIB # Check if there is custom/*.cfg for this BSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" -AC_SUBST(PROJECT_INCLUDE) - # Try to explicitly list a Makefile here AC_OUTPUT( Makefile diff --git a/c/src/exec/score/cpu/i386/configure.in b/c/src/exec/score/cpu/i386/configure.in index de9384efd1..bb3809856b 100644 --- a/c/src/exec/score/cpu/i386/configure.in +++ b/c/src/exec/score/cpu/i386/configure.in @@ -30,9 +30,6 @@ RTEMS_CHECK_NEWLIB # Check if there is custom/*.cfg for this BSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" -AC_SUBST(PROJECT_INCLUDE) - # Try to explicitly list a Makefile here AC_OUTPUT( Makefile diff --git a/c/src/exec/score/cpu/i960/configure.in b/c/src/exec/score/cpu/i960/configure.in index 6eb18eab01..7ce69f661f 100644 --- a/c/src/exec/score/cpu/i960/configure.in +++ b/c/src/exec/score/cpu/i960/configure.in @@ -30,9 +30,6 @@ RTEMS_CHECK_NEWLIB # Check if there is custom/*.cfg for this BSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" -AC_SUBST(PROJECT_INCLUDE) - # Try to explicitly list a Makefile here AC_OUTPUT( Makefile diff --git a/c/src/exec/score/cpu/m68k/configure.in b/c/src/exec/score/cpu/m68k/configure.in index 9906bfd2ef..0d3dbe618f 100644 --- a/c/src/exec/score/cpu/m68k/configure.in +++ b/c/src/exec/score/cpu/m68k/configure.in @@ -30,9 +30,6 @@ RTEMS_CHECK_NEWLIB # Check if there is custom/*.cfg for this BSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" -AC_SUBST(PROJECT_INCLUDE) - # Try to explicitly list a Makefile here AC_OUTPUT( Makefile diff --git a/c/src/exec/score/cpu/mips/configure.in b/c/src/exec/score/cpu/mips/configure.in index c26e7cb248..ee34a0c8e1 100644 --- a/c/src/exec/score/cpu/mips/configure.in +++ b/c/src/exec/score/cpu/mips/configure.in @@ -30,9 +30,6 @@ RTEMS_CHECK_NEWLIB # Check if there is custom/*.cfg for this BSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" -AC_SUBST(PROJECT_INCLUDE) - # Try to explicitly list a Makefile here AC_OUTPUT( Makefile diff --git a/c/src/exec/score/cpu/mips64orion/configure.in b/c/src/exec/score/cpu/mips64orion/configure.in index c26e7cb248..ee34a0c8e1 100644 --- a/c/src/exec/score/cpu/mips64orion/configure.in +++ b/c/src/exec/score/cpu/mips64orion/configure.in @@ -30,9 +30,6 @@ RTEMS_CHECK_NEWLIB # Check if there is custom/*.cfg for this BSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" -AC_SUBST(PROJECT_INCLUDE) - # Try to explicitly list a Makefile here AC_OUTPUT( Makefile diff --git a/c/src/exec/score/cpu/no_cpu/configure.in b/c/src/exec/score/cpu/no_cpu/configure.in index 30a1dbec38..772bc9fb25 100644 --- a/c/src/exec/score/cpu/no_cpu/configure.in +++ b/c/src/exec/score/cpu/no_cpu/configure.in @@ -30,9 +30,6 @@ RTEMS_CHECK_NEWLIB # Check if there is custom/*.cfg for this BSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" -AC_SUBST(PROJECT_INCLUDE) - # Try to explicitly list a Makefile here AC_OUTPUT( Makefile diff --git a/c/src/exec/score/cpu/powerpc/configure.in b/c/src/exec/score/cpu/powerpc/configure.in index 5acd36eab3..665fe5997f 100644 --- a/c/src/exec/score/cpu/powerpc/configure.in +++ b/c/src/exec/score/cpu/powerpc/configure.in @@ -31,9 +31,6 @@ RTEMS_CHECK_NEWLIB RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) -PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" -AC_SUBST(PROJECT_INCLUDE) - AM_CONDITIONAL(PPC_NEW_EXCEPTION_PROCESSING,test "$RTEMS_CPU_MODEL" = "mpc750" -o "$RTEMS_CPU_MODEL" = "mpc604") # Try to explicitly list a Makefile here diff --git a/c/src/exec/score/cpu/sh/configure.in b/c/src/exec/score/cpu/sh/configure.in index dad4bc91c4..2b9e709f1e 100644 --- a/c/src/exec/score/cpu/sh/configure.in +++ b/c/src/exec/score/cpu/sh/configure.in @@ -31,9 +31,6 @@ RTEMS_CHECK_NEWLIB RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) -PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" -AC_SUBST(PROJECT_INCLUDE) - # Try to explicitly list a Makefile here AC_OUTPUT( Makefile diff --git a/c/src/exec/score/cpu/sparc/configure.in b/c/src/exec/score/cpu/sparc/configure.in index ac8fd7f289..f155436c69 100644 --- a/c/src/exec/score/cpu/sparc/configure.in +++ b/c/src/exec/score/cpu/sparc/configure.in @@ -30,9 +30,6 @@ RTEMS_CHECK_NEWLIB # Check if there is custom/*.cfg for this BSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" -AC_SUBST(PROJECT_INCLUDE) - # Try to explicitly list a Makefile here AC_OUTPUT( Makefile diff --git a/c/src/exec/score/cpu/unix/configure.in b/c/src/exec/score/cpu/unix/configure.in index e9ee7b9b9f..bce3a818b3 100644 --- a/c/src/exec/score/cpu/unix/configure.in +++ b/c/src/exec/score/cpu/unix/configure.in @@ -37,9 +37,6 @@ if test "$HAS_MP" = "yes"; then RTEMS_CHECK_SYSV_UNIX fi -PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" -AC_SUBST(PROJECT_INCLUDE) - # Try to explicitly list a Makefile here AC_OUTPUT( Makefile diff --git a/c/src/lib/configure.in b/c/src/lib/configure.in index 2128e569a7..f659403060 100644 --- a/c/src/lib/configure.in +++ b/c/src/lib/configure.in @@ -51,9 +51,6 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") AC_CONFIG_SUBDIRS($cfg_subdirs) -PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" -AC_SUBST(PROJECT_INCLUDE) - # try to explicitly list a Makefile here AC_OUTPUT( Makefile diff --git a/c/src/lib/libbsp/a29k/configure.in b/c/src/lib/libbsp/a29k/configure.in index 0e129d5302..6488100467 100644 --- a/c/src/lib/libbsp/a29k/configure.in +++ b/c/src/lib/libbsp/a29k/configure.in @@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-a29k,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) diff --git a/c/src/lib/libbsp/bare/Makefile.am b/c/src/lib/libbsp/bare/Makefile.am index 4c1ea45a78..db8ee902e2 100644 --- a/c/src/lib/libbsp/bare/Makefile.am +++ b/c/src/lib/libbsp/bare/Makefile.am @@ -9,13 +9,7 @@ include $(top_srcdir)/../bsp.am SUBDIRS = . include -$(PROJECT_RELEASE)/bsp_specs: bsp_specs - $(INSTALL_DATA) $< $@ - -all-local : $(PREINSTALL_FILES) - -EXTRA_DIST = \ -build-tools bsp_specs do-bare-bsp-build +EXTRA_DIST = bsp_specs build-tools do-bare-bsp-build include $(top_srcdir)/../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libbsp/bare/configure.in b/c/src/lib/libbsp/bare/configure.in index 218ce78889..517102de4b 100644 --- a/c/src/lib/libbsp/bare/configure.in +++ b/c/src/lib/libbsp/bare/configure.in @@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-bare,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) diff --git a/c/src/lib/libbsp/bare/include/Makefile.am b/c/src/lib/libbsp/bare/include/Makefile.am index 46ceb70cac..8b4b05be9d 100644 --- a/c/src/lib/libbsp/bare/include/Makefile.am +++ b/c/src/lib/libbsp/bare/include/Makefile.am @@ -3,13 +3,11 @@ ## AUTOMAKE_OPTIONS = foreign 1.4 + H_FILES = bsp.h -noinst_HEADERS = $(H_FILES) -TMPINSTALL_FILES += \ -$(PROJECT_INCLUDE) \ -$(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \ -$(PROJECT_INCLUDE)/coverhd.h +$(PROJECT_INCLUDE): + $(mkinstalldirs) $@ $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ @@ -17,6 +15,11 @@ $(PROJECT_INCLUDE)/%.h: %.h $(PROJECT_INCLUDE)/coverhd.h: $(srcdir)/../../shared/include/coverhd.h $(INSTALL_DATA) $< $@ +TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \ + $(PROJECT_INCLUDE)/coverhd.h + all-local: $(TMPINSTALL_FILES) +EXTRA_DIST = bsp.h + include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libbsp/bare/wrapup/Makefile.in b/c/src/lib/libbsp/bare/wrapup/Makefile.in deleted file mode 100644 index ac79fc207a..0000000000 --- a/c/src/lib/libbsp/bare/wrapup/Makefile.in +++ /dev/null @@ -1,64 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = bare/wrapup - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -BSP_PIECES = -GENERIC_PIECES = - -# bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), ../$(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 += -CPPFLAGS += -CFLAGS += - -LD_PATHS += -LD_LIBS += -LDFLAGS += - -# -# Add your list of files to delete here. The config files -# already know how to delete some stuff, so you may want -# to just run 'make clean' first to see what gets missed. -# 'make clobber' already includes 'make clean' -# - -CLEAN_ADDITIONS += -CLOBBER_ADDITIONS += - -$(LIB): ${OBJS} - $(make-library) - -all: ${ARCH} $(SRCS) $(LIB) - $(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib - -$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs - $(INSTALL_DATA) $< $@ - -Makefile: $(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/hppa1.1/configure.in b/c/src/lib/libbsp/hppa1.1/configure.in index eead2adc73..27118a3377 100644 --- a/c/src/lib/libbsp/hppa1.1/configure.in +++ b/c/src/lib/libbsp/hppa1.1/configure.in @@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-hppa1.1,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) diff --git a/c/src/lib/libbsp/i386/configure.in b/c/src/lib/libbsp/i386/configure.in index e01d89ddac..8538f5a7a7 100644 --- a/c/src/lib/libbsp/i386/configure.in +++ b/c/src/lib/libbsp/i386/configure.in @@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i386,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) diff --git a/c/src/lib/libbsp/i386/pc386/tools/configure.in b/c/src/lib/libbsp/i386/pc386/tools/configure.in index ebed8e0411..853d7bfb78 100644 --- a/c/src/lib/libbsp/i386/pc386/tools/configure.in +++ b/c/src/lib/libbsp/i386/pc386/tools/configure.in @@ -12,6 +12,7 @@ AM_INIT_AUTOMAKE(rtems-lib-libbsp-i386-pc386-tools,$RTEMS_VERSION,no) AM_MAINTAINER_MODE AC_EXEEXT +RTEMS_ENV_RTEMSBSP AC_PROG_CC AC_CHECK_FUNCS(strtoul) diff --git a/c/src/lib/libbsp/i960/configure.in b/c/src/lib/libbsp/i960/configure.in index acedf644a1..e9b306361c 100644 --- a/c/src/lib/libbsp/i960/configure.in +++ b/c/src/lib/libbsp/i960/configure.in @@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i960,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) diff --git a/c/src/lib/libbsp/i960/cvme961/configure.in b/c/src/lib/libbsp/i960/cvme961/configure.in index d1e8fd7b77..2fcffc49dd 100644 --- a/c/src/lib/libbsp/i960/cvme961/configure.in +++ b/c/src/lib/libbsp/i960/cvme961/configure.in @@ -8,7 +8,7 @@ RTEMS_TOP(../../../../../..) AC_CONFIG_AUX_DIR(../../../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-no_cpu-cvme961,$RTEMS_VERSION,no) +AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i960-cvme961,$RTEMS_VERSION,no) AM_MAINTAINER_MODE RTEMS_ENABLE_LIBCDIR diff --git a/c/src/lib/libbsp/i960/rxgen960/configure.in b/c/src/lib/libbsp/i960/rxgen960/configure.in index 7c934b2f13..f974725f55 100644 --- a/c/src/lib/libbsp/i960/rxgen960/configure.in +++ b/c/src/lib/libbsp/i960/rxgen960/configure.in @@ -8,7 +8,7 @@ RTEMS_TOP(../../../../../..) AC_CONFIG_AUX_DIR(../../../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-no_cpu-rxgen960,$RTEMS_VERSION,no) +AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i960-rxgen960,$RTEMS_VERSION,no) AM_MAINTAINER_MODE RTEMS_ENABLE_LIBCDIR diff --git a/c/src/lib/libbsp/m68k/configure.in b/c/src/lib/libbsp/m68k/configure.in index ce0e518d26..3dac2230e9 100644 --- a/c/src/lib/libbsp/m68k/configure.in +++ b/c/src/lib/libbsp/m68k/configure.in @@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) diff --git a/c/src/lib/libbsp/mips/configure.in b/c/src/lib/libbsp/mips/configure.in index 1ccc8b0fe1..63c7590854 100644 --- a/c/src/lib/libbsp/mips/configure.in +++ b/c/src/lib/libbsp/mips/configure.in @@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-mips64orion,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) diff --git a/c/src/lib/libbsp/mips64orion/configure.in b/c/src/lib/libbsp/mips64orion/configure.in index 1ccc8b0fe1..63c7590854 100644 --- a/c/src/lib/libbsp/mips64orion/configure.in +++ b/c/src/lib/libbsp/mips64orion/configure.in @@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-mips64orion,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) diff --git a/c/src/lib/libbsp/no_cpu/configure.in b/c/src/lib/libbsp/no_cpu/configure.in index 44ced6684c..6da3fd2deb 100644 --- a/c/src/lib/libbsp/no_cpu/configure.in +++ b/c/src/lib/libbsp/no_cpu/configure.in @@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-no_cpu,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) diff --git a/c/src/lib/libbsp/sh/configure.in b/c/src/lib/libbsp/sh/configure.in index 6659f81adc..0019a783ab 100644 --- a/c/src/lib/libbsp/sh/configure.in +++ b/c/src/lib/libbsp/sh/configure.in @@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-sh,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) diff --git a/c/src/lib/libbsp/sparc/configure.in b/c/src/lib/libbsp/sparc/configure.in index 66e3417aae..4fbf519a74 100644 --- a/c/src/lib/libbsp/sparc/configure.in +++ b/c/src/lib/libbsp/sparc/configure.in @@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-sparc,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) diff --git a/c/src/lib/libbsp/unix/configure.in b/c/src/lib/libbsp/unix/configure.in index cd6ad2a797..7bf7d9998e 100644 --- a/c/src/lib/libbsp/unix/configure.in +++ b/c/src/lib/libbsp/unix/configure.in @@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-unix,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) diff --git a/c/src/lib/libcpu/a29k/clock/ckinit.c b/c/src/lib/libcpu/a29k/clock/ckinit.c index 7d2ca5fe8e..b52c7aaa63 100644 --- a/c/src/lib/libcpu/a29k/clock/ckinit.c +++ b/c/src/lib/libcpu/a29k/clock/ckinit.c @@ -10,7 +10,7 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * ckinit.c,v 1.5 1995/10/30 21:53:23 joel Exp + * $Id$ */ #ifndef lint diff --git a/c/src/lib/libcpu/a29k/clock/clock.h b/c/src/lib/libcpu/a29k/clock/clock.h index 61b1c5905a..5e45157c86 100644 --- a/c/src/lib/libcpu/a29k/clock/clock.h +++ b/c/src/lib/libcpu/a29k/clock/clock.h @@ -1,4 +1,6 @@ -/* @(#)clock.h 03/15/96 1.1 */ +/* + * $Id$ + */ extern void a29k_init_timer( unsigned32 timer_clock_interval ); extern void a29k_disable_timer(void); diff --git a/c/src/lib/libcpu/a29k/timer/Makefile.am b/c/src/lib/libcpu/a29k/timer/Makefile.am index 61e9235ee9..f17c802679 100644 --- a/c/src/lib/libcpu/a29k/timer/Makefile.am +++ b/c/src/lib/libcpu/a29k/timer/Makefile.am @@ -1,7 +1,6 @@ ## -## Makefile,v 1.2 1995/05/31 16:56:37 joel Exp +## $Id$ ## -## @(#)Makefile 03/26/96 1.2 AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libcpu/a29k/timer/timer.c b/c/src/lib/libcpu/a29k/timer/timer.c index 39834fc399..1391106828 100644 --- a/c/src/lib/libcpu/a29k/timer/timer.c +++ b/c/src/lib/libcpu/a29k/timer/timer.c @@ -16,7 +16,7 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * timer.c,v 1.2 1995/05/31 16:56:39 joel Exp + * $Id$ */ #ifndef lint diff --git a/c/src/lib/libcpu/a29k/timer/timerisr.c b/c/src/lib/libcpu/a29k/timer/timerisr.c index 82c3c80d9f..3567222cfa 100644 --- a/c/src/lib/libcpu/a29k/timer/timerisr.c +++ b/c/src/lib/libcpu/a29k/timer/timerisr.c @@ -21,7 +21,7 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * timerisr.c,v 1.2 1995/05/31 16:56:40 joel Exp + * $Id$ */ #ifndef lint diff --git a/c/src/librpc/configure.in b/c/src/librpc/configure.in index dc3980fe45..4b5ac39717 100644 --- a/c/src/librpc/configure.in +++ b/c/src/librpc/configure.in @@ -29,9 +29,6 @@ RTEMS_CHECK_NETWORKING(RTEMS_BSP) AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") -PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" -AC_SUBST(PROJECT_INCLUDE) - RTEMS_PROJECT_ROOT # try to explicitly list a Makefile here diff --git a/c/src/librtems++/configure.in b/c/src/librtems++/configure.in index 37288ddb93..6662241950 100644 --- a/c/src/librtems++/configure.in +++ b/c/src/librtems++/configure.in @@ -29,9 +29,6 @@ RTEMS_CANONICALIZE_TOOLS AM_CONDITIONAL(HAS_CXX,test "$HAS_CPLUSPLUS" = "yes") -PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" -AC_SUBST(PROJECT_INCLUDE) - RTEMS_PROJECT_ROOT AC_OUTPUT( diff --git a/make/custom/dmv152.cfg b/make/custom/dmv152.cfg index 84c63061ec..a76804d6aa 100644 --- a/make/custom/dmv152.cfg +++ b/make/custom/dmv152.cfg @@ -67,11 +67,11 @@ define make-exe endef else define make-exe - $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -o $(basename $@).nxe \ + $(LINK.c) $(LDLIBS) -o $(basename $@).nxe \ $(LINK_OBJS) $(LINK_LIBS) $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ - $(PACKHEX) > $(basename $@).exe + $(PACKHEX) > $@ $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe endef diff --git a/make/custom/gensh2.cfg b/make/custom/gensh2.cfg index 8c2f8d87c8..4ef24d80f5 100644 --- a/make/custom/gensh2.cfg +++ b/make/custom/gensh2.cfg @@ -83,7 +83,7 @@ else define make-exe $(LINK.c) -Wl,-Map,$(basename $@).map \ $(LDLIBS) -o $@ \ - $(LINK_OBJS) -lstdc++ $(LINK_LIBS) + $(LINK_OBJS) $(LINK_LIBS) -lstdc++ $(NM) -n $@ > $(basename $@).num $(SIZE) $@ endef diff --git a/scripts-ada/Makefile.am b/scripts-ada/Makefile.am index 30fd57fad3..40b0dd7700 100644 --- a/scripts-ada/Makefile.am +++ b/scripts-ada/Makefile.am @@ -1,3 +1,7 @@ +## +## $Id$ +## + AUTOMAKE_OPTIONS = foreign SUBDIRS = . binutils gnatnewlib gdb diff --git a/scripts-ada/binutils/Makefile.am b/scripts-ada/binutils/Makefile.am index fbedcd1d21..fb6187f3bf 100644 --- a/scripts-ada/binutils/Makefile.am +++ b/scripts-ada/binutils/Makefile.am @@ -1,4 +1,6 @@ +## ## $Id$ +## AUTOMAKE_OPTIONS = foreign diff --git a/scripts-ada/gdb/Makefile.am b/scripts-ada/gdb/Makefile.am index bb562e1894..28c40a8ed5 100644 --- a/scripts-ada/gdb/Makefile.am +++ b/scripts-ada/gdb/Makefile.am @@ -1,3 +1,7 @@ +## +## $Id$ +## + AUTOMAKE_OPTIONS = foreign MKGDBSPEC = $(SHELL) $(top_builddir)/mkgdbspec diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 6cf5e015a2..2daa93a409 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1,3 +1,7 @@ +## +## $Id$ +## + AUTOMAKE_OPTIONS = foreign SUBDIRS = . binutils gccnewlib gdb rtems diff --git a/scripts/binutils/Makefile.am b/scripts/binutils/Makefile.am index 83556b88b5..0e40d96a8e 100644 --- a/scripts/binutils/Makefile.am +++ b/scripts/binutils/Makefile.am @@ -1,4 +1,6 @@ +## ## $Id$ +## AUTOMAKE_OPTIONS = foreign diff --git a/scripts/gccnewlib/Makefile.am b/scripts/gccnewlib/Makefile.am index 38102acae9..659f284c81 100644 --- a/scripts/gccnewlib/Makefile.am +++ b/scripts/gccnewlib/Makefile.am @@ -1,4 +1,6 @@ +## ## $Id$ +## AUTOMAKE_OPTIONS = foreign diff --git a/scripts/gccnewlib/gccnewlib.spec.in b/scripts/gccnewlib/gccnewlib.spec.in index cf95d060f5..bb2607eb44 100644 --- a/scripts/gccnewlib/gccnewlib.spec.in +++ b/scripts/gccnewlib/gccnewlib.spec.in @@ -1,7 +1,7 @@ # # spec file for building gcc for rtems # -# Copyright (c) 1999 OARCorp, Huntsville, AL +# Copyright (c) 1999,2000 OARCorp, Huntsville, AL # # please send bugfixes or comments to joel@OARcorp.com # @@ -14,8 +14,11 @@ Group: rtems Release: @Release@ Copyright: 1999 OARCorp -Provides: rtems-base-gcc @target_alias@-gcc @target_alias@-chill -Provides: @target_alias@-gcj @target_alias@-g77 @target_alias@-objc +Provides: rtems-base-gcc @target_alias@-gcc +Provides: rtems-base-chill @target_alias@-chill +Provides: rtems-base-gcj @target_alias@-gcj +Provides: rtems-base-g77 @target_alias@-g77 +Provides: @target_alias@-objc Requires: @target_alias@-binutils Autoreqprov: on @@ -53,69 +56,9 @@ This is gcc's and newlib C Library's sources with patches for RTEMS. the more than 10 targets it is possible to build. You can get them yourself from the Internet and copy them to - your /usr/src/redhat/SOURCES directory ($RPM_SOURCE_DIR). + your /usr/src/[redhat|packages]/SOURCES directory ($RPM_SOURCE_DIR). Or you can try the ftp options of rpm :-) -%package -n rtems-base-gcc -Summary: base package for rtems gcc and newlib C Library -Group: rtems - -%description -n rtems-base-gcc - -RTEMS is an open source operating system for embedded systems. - -This is the files for gcc and newlib that are shared by all targets. - -%package -n @target_alias@-gcc -Summary: rtems gcc and newlib C Library for @target_alias@ -Group: rtems -Requires: @target_alias@-binutils rtems-base-gcc - -%description -n @target_alias@-gcc -RTEMS is an open source operating system for embedded systems. - -This is gcc and newlib C Library for @target_alias@. - -%package -n @target_alias@-chill -Summary: gcc/chill compiler for @target_alias@ -Group: rtems -Requires: @target_alias@-gcc - -%description -n @target_alias@-chill -RTEMS is an open source operating system for embedded systems. - -This is the gcc/chill compiler and support files for @target_alias@ - -%package -n @target_alias@-gcj -Summary: gcc/java compiler (gcj) for @target_alias@ -Group: rtems -Requires: @target_alias@-gcc - -%description -n @target_alias@-gcj -RTEMS is an open source operating system for embedded systems. - -This is the gcc/java compiler for @target_alias@ - -%package -n @target_alias@-g77 -Summary: gcc/g77 compiler for @target_alias@ -Group: rtems -Requires: @target_alias@-gcc - -%description -n @target_alias@-g77 -RTEMS is an open source operating system for embedded systems. - -This is the gcc/g77 compiler for @target_alias@ - -%package -n @target_alias@-objc -Summary: gcc/objc compiler for @target_alias@ -Group: rtems -Requires: @target_alias@-objc - -%description -n @target_alias@-objc -RTEMS is an open source operating system for embedded systems. - -This is the gcc/objc compiler for @target_alias@ - %prep # untar the sources inside @target_alias@-gcc-newlib %setup -c -n @target_alias@-gcc-newlib -a 0 -a 1 @@ -198,13 +141,25 @@ This is the gcc/objc compiler for @target_alias@ esac done +# ============================================================== +# rtems-base-gcc +# ============================================================== +%package -n rtems-base-gcc +Summary: base package for rtems gcc and newlib C Library +Group: rtems + +%description -n rtems-base-gcc + +RTEMS is an open source operating system for embedded systems. + +This is the files for gcc and newlib that are shared by all targets. + %files -n rtems-base-gcc %dir /opt/rtems/info -# %doc /opt/rtems/info/dir -%doc /opt/rtems/info/cpp.info* -%doc /opt/rtems/info/gcc.info* -%doc /opt/rtems/info/libc.info* -%doc /opt/rtems/info/libm.info* +%doc /opt/rtems/info/cpp.info*.gz +%doc /opt/rtems/info/gcc.info*.gz +%doc /opt/rtems/info/libc.info*.gz +%doc /opt/rtems/info/libm.info*.gz %dir /opt/rtems/bin /opt/rtems/bin/cpp@exe_ext@ @@ -217,22 +172,7 @@ This is the gcc/objc compiler for @target_alias@ %dir /opt/rtems/include /opt/rtems/include/g++-3 -%files -n @target_alias@-gcc -f build/files.gcc - -%doc /opt/rtems/man/man1/@target_alias@-gcc.1 -%doc /opt/rtems/man/man1/@target_alias@-g++.1 - -/opt/rtems/bin/@target_alias@-c++@exe_ext@ -/opt/rtems/bin/@target_alias@-g++@exe_ext@ -/opt/rtems/bin/@target_alias@-gcc@exe_ext@ -/opt/rtems/bin/@target_alias@-protoize@exe_ext@ -/opt/rtems/bin/@target_alias@-unprotoize@exe_ext@ - -%dir /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/include - -/opt/rtems/@target_alias@ - -%post -n @target_alias@-gcc +%post -n rtems-base-gcc if test -d $RPM_INSTALL_PREFIX/rtems/info; then rm -f $RPM_INSTALL_PREFIX/rtems/info/dir @@ -242,7 +182,7 @@ This is the gcc/objc compiler for @target_alias@ done fi -%postun -n @target_alias@-gcc +%postun -n rtems-base-gcc if test -d $RPM_INSTALL_PREFIX/rtems/info; then rm -f $RPM_INSTALL_PREFIX/rtems/info/dir @@ -252,16 +192,51 @@ This is the gcc/objc compiler for @target_alias@ done fi +# ============================================================== +# @target_alias@-gcc +# ============================================================== +%package -n @target_alias@-gcc +Summary: rtems gcc and newlib C Library for @target_alias@ +Group: rtems +Requires: @target_alias@-binutils rtems-base-gcc + +%description -n @target_alias@-gcc +RTEMS is an open source operating system for embedded systems. -%files -n @target_alias@-chill -f build/files.chill -%dir /opt/rtems/bin -/opt/rtems/bin/@target_alias@-chill +This is gcc and newlib C Library for @target_alias@. + +%files -n @target_alias@-gcc -f build/files.gcc +%doc /opt/rtems/man/man1/@target_alias@-gcc.1 +%doc /opt/rtems/man/man1/@target_alias@-g++.1 + +/opt/rtems/bin/@target_alias@-c++@exe_ext@ +/opt/rtems/bin/@target_alias@-g++@exe_ext@ +/opt/rtems/bin/@target_alias@-gcc@exe_ext@ +/opt/rtems/bin/@target_alias@-protoize@exe_ext@ +/opt/rtems/bin/@target_alias@-unprotoize@exe_ext@ + +%dir /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/include + +/opt/rtems/@target_alias@ + +# ============================================================== +# rtems-base-chill +# ============================================================== +%package -n rtems-base-chill +Summary: base package for rtems gcc/chill compiler. +Group: rtems +Requires: rtems-base-gcc + +%description -n rtems-base-chill +RTEMS is an open source operating system for embedded systems. +This is the files for gcc/chill that are shared by all targets. + +%files -n rtems-base-chill %dir /opt/rtems/info -%doc /opt/rtems/info/dir -%doc /opt/rtems/info/chill.info* +%doc /opt/rtems/info/chill.info*.gz -%post -n @target_alias@-chill +%post -n rtems-base-chill if test -d $RPM_INSTALL_PREFIX/rtems/info; then rm -f $RPM_INSTALL_PREFIX/rtems/info/dir @@ -271,7 +246,7 @@ This is the gcc/objc compiler for @target_alias@ done fi -%postun -n @target_alias@-chill +%postun -n rtems-base-chill if test -d $RPM_INSTALL_PREFIX/rtems/info; then rm -f $RPM_INSTALL_PREFIX/rtems/info/dir @@ -281,32 +256,84 @@ This is the gcc/objc compiler for @target_alias@ done fi +# ============================================================== +# @target_alias@-chill +# ============================================================== +%package -n @target_alias@-chill +Summary: gcc/chill compiler for @target_alias@ +Group: rtems +Requires: rtems-base-chill @target_alias@-gcc -%files -n @target_alias@-gcj -f build/files.gcj +%description -n @target_alias@-chill +RTEMS is an open source operating system for embedded systems. + +This is the gcc/chill compiler and support files for @target_alias@ + +%files -n @target_alias@-chill -f build/files.chill +%dir /opt/rtems/bin +/opt/rtems/bin/@target_alias@-chill + +# ============================================================== +# rtems-base-gcj +# ============================================================== +%package -n rtems-base-gcj +Summary: base package for rtems gcc/java compiler (gcj). +Group: rtems +Requires: rtems-base-gcc + +%description -n rtems-base-gcj +RTEMS is an open source operating system for embedded systems. + +This is the files for gcc/java (gcj) that are shared by all targets. + +%files -n rtems-base-gcj %dir /opt/rtems/bin /opt/rtems/bin/jcf-dump@exe_ext@ /opt/rtems/bin/jv-scan@exe_ext@ /opt/rtems/bin/gcjh@exe_ext@ + +# ============================================================== +# @target_alias@-gcj +# ============================================================== +%package -n @target_alias@-gcj +Summary: gcc/java compiler (gcj) for @target_alias@ +Group: rtems +Requires: rtems-base-gcj @target_alias@-gcc + +%description -n @target_alias@-gcj +RTEMS is an open source operating system for embedded systems. + +This is the gcc/java compiler for @target_alias@ + +%files -n @target_alias@-gcj -f build/files.gcj +%dir /opt/rtems/bin /opt/rtems/bin/@target_alias@-gcj@exe_ext@ /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/jc1 /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/jvgenmain +# ============================================================== +# rtems-base-g77 +# ============================================================== +%package -n rtems-base-g77 +Summary: rtems base package for gcc/g77 compiler +Group: rtems +Requires: rtems-base-gcc -%files -n @target_alias@-g77 -f build/files.g77 -%dir /opt/rtems/bin -/opt/rtems/bin/@target_alias@-g77@exe_ext@ +%description -n rtems-base-g77 +RTEMS is an open source operating system for embedded systems. +This is the files for gcc/g77 that are shared by all targets. + +%files -n rtems-base-g77 %dir /opt/rtems/info -%doc /opt/rtems/info/g77.info* +%doc /opt/rtems/info/g77.info*.gz %dir /opt/rtems/man %dir /opt/rtems/man/man1 %doc /opt/rtems/man/man1/@target_alias@-g77.1 -/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/f771@exe_ext@ - -%post -n @target_alias@-g77 +%post -n rtems-base-g77 if test -d $RPM_INSTALL_PREFIX/rtems/info; then rm -f $RPM_INSTALL_PREFIX/rtems/info/dir @@ -316,7 +343,7 @@ This is the gcc/objc compiler for @target_alias@ done fi -%postun -n @target_alias@-g77 +%postun -n rtems-base-g77 if test -d $RPM_INSTALL_PREFIX/rtems/info; then rm -f $RPM_INSTALL_PREFIX/rtems/info/dir @@ -326,6 +353,37 @@ This is the gcc/objc compiler for @target_alias@ done fi +# ============================================================== +# @target_alias@-g77 +# ============================================================== +%package -n @target_alias@-g77 +Summary: gcc/g77 compiler for @target_alias@ +Group: rtems +Requires: rtems-base-g77 @target_alias@-gcc + +%description -n @target_alias@-g77 +RTEMS is an open source operating system for embedded systems. + +This is the gcc/g77 compiler for @target_alias@ + +%files -n @target_alias@-g77 -f build/files.g77 +%dir /opt/rtems/bin +/opt/rtems/bin/@target_alias@-g77@exe_ext@ + +/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/f771@exe_ext@ + +# ============================================================== +# @target_alias@-objc +# ============================================================== +%package -n @target_alias@-objc +Summary: gcc/objc compiler for @target_alias@ +Group: rtems +Requires: @target_alias@-gcc + +%description -n @target_alias@-objc +RTEMS is an open source operating system for embedded systems. + +This is the gcc/objc compiler for @target_alias@ %files -n @target_alias@-objc -f build/files.objc /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/cc1obj@exe_ext@ diff --git a/scripts/gdb/Makefile.am b/scripts/gdb/Makefile.am index 74782485cb..16bd1e449c 100644 --- a/scripts/gdb/Makefile.am +++ b/scripts/gdb/Makefile.am @@ -1,3 +1,7 @@ +## +## $Id$ +## + AUTOMAKE_OPTIONS = foreign MKGDBSPEC = $(SHELL) $(top_builddir)/mkgdbspec diff --git a/scripts/rtems/Makefile.am b/scripts/rtems/Makefile.am index f7158237ef..d6cce0214d 100644 --- a/scripts/rtems/Makefile.am +++ b/scripts/rtems/Makefile.am @@ -1,3 +1,7 @@ +## +## $Id$ +## + AUTOMAKE_OPTIONS = foreign MKBSPSPEC = $(SHELL) $(top_builddir)/mkbspspec |