Towards automake X patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:

This one once again changes the scheme to preinstall bsp_specs. It moves generating PROJECT_ROOT/lib/bsp_specs to libbsp/<cpu>/<bsp>/wrapup/Makefile.in. I.e. it decentralizes generation of bsp_specs to a bsp-dependent directory, because preinstalling bsp_specs in a centralized Makefile like it has been done until now does not harmonize well with spliting the toplevel configure script in cpu and bsp-dependent configure scripts and automake. First apply the patch (rtems-rc-19990318-0.diff) below, then run the reorg-bsp_specs.sh script. IMO, this one is comparatively harmless and eases automake support significantly.
1999-03-19 22:10:04 +00:00
parent e619c2895b
commit 5906ac5e9f
32 changed files with 156 additions and 12 deletions
--- a/c/Makefile.in
+++ b/c/Makefile.in
@@ -66,17 +66,6 @@ CREATE_DIRS = \

 BUILD_DIRS = ${CREATE_DIRS:%=$(PROJECT_ROOT)/$(RTEMS_BSP)/%}

-# bsp_specs should be installed by a bsp-specific configure script
-BSP_SPECS = $(PROJECT_RELEASE)/lib/bsp_specs
-ifeq ($(RTEMS_BSP),bare)
-BSP_SPECS_DIR = $(RTEMS_ROOT)/c/src/lib/libbsp/$(RTEMS_BSP_FAMILY)
-else        
-BSP_SPECS_DIR = $(RTEMS_ROOT)/c/src/lib/libbsp/$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)
-endif
-
-$(BSP_SPECS): $(BSP_SPECS_DIR)/bsp_specs
-	$(INSTALL) $(INSTDATAFLAGS) $< $@
-
 # Make all/install must include 'env'
 # if something is added to TARGET_VARIANTS, then account for it here
 make_src_makefiles: Makefile.in Makefile
@@ -157,5 +146,5 @@ debug_tests: debug
 profile_tests: profile
 	cd src/tests; $(MAKE) profile

-env:    $(SRCS) dirs $(BSP_SPECS)
+env:    $(SRCS) dirs

--- a/c/src/lib/libbsp/bare/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/bare/wrapup/Makefile.in
@@ -49,3 +49,8 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in
@@ -59,3 +59,8 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/i386/force386/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/i386/force386/wrapup/Makefile.in
@@ -54,3 +54,8 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/i386/go32/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/i386/go32/wrapup/Makefile.in
@@ -51,3 +51,8 @@ all:	${ARCH} $(SRCS) $(LIB)

 install:  all

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.in
@@ -55,3 +55,8 @@ all:	${ARCH} $(SRCS) $(LIB)

 install:  all

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in
@@ -59,3 +59,8 @@ all:	${ARCH} $(SRCS) $(LIB)



+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in
@@ -56,3 +56,8 @@ all:	${ARCH} $(SRCS) $(LIB)

 install:  all

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.in
@@ -49,3 +49,8 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.in
@@ -49,3 +49,8 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.in
@@ -49,3 +49,8 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.in
@@ -49,3 +49,8 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.in
@@ -54,3 +54,8 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in
@@ -58,3 +58,8 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/m68k/idp/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/idp/wrapup/Makefile.in
@@ -49,3 +49,8 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in
@@ -54,3 +54,8 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.in
@@ -49,3 +49,8 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in
@@ -54,3 +54,8 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.in
@@ -55,3 +55,8 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.in
@@ -60,3 +60,8 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.in
@@ -49,3 +49,8 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/mips64orion/p4000/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/mips64orion/p4000/wrapup/Makefile.in
@@ -53,3 +53,8 @@ all:	${ARCH} $(SRCS) $(LIB)

 install:  all

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.in
@@ -62,3 +62,8 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.in
@@ -60,3 +60,8 @@ all:	${ARCH} $(SRCS) $(LIB)

 install:  all

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.in
@@ -56,3 +56,8 @@ all:	${ARCH} $(SRCS) $(LIB)

 install:  all

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.in
@@ -57,3 +57,8 @@ all:	${ARCH} $(SRCS) $(LIB)

 install:  all

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.in
@@ -59,3 +59,8 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.in
@@ -59,3 +59,8 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.in
@@ -54,3 +54,8 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.in
@@ -62,3 +62,8 @@ all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

 install:  all
+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.in
@@ -54,3 +54,8 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
--- a/c/src/lib/libbsp/unix/posix/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/unix/posix/wrapup/Makefile.in
@@ -59,3 +59,8 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib

+
+$(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
+	$(INSTALL_DATA) $< $@
+
+preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs