Patch rtems-rc-19991117-16.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:

* the PACKHEX etc problem
  * prevents the *.rels being removed inside the build-tree
  * a typo which only shows for when MP is activated
  * Alters some custom/*cfg files

c/src/exec/rtems/include/rtems/rtems/Makefile.am

@@ -13,7 +13,7 @@ STD_H_FILES = asr.h attr.h clock.h config.h dpmem.h event.h eventset.h intr.h \
     signal.h status.h support.h tasks.h timer.h types.h
 
 if HAS_MP
-H_FILES = $(STD_HFILES) $(MP_H_FILES)
+H_FILES = $(STD_H_FILES) $(MP_H_FILES)
 else
 H_FILES = $(STD_H_FILES)
 endif

c/src/exec/rtems/optman/Makefile.am

@@ -33,7 +33,7 @@ $(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
 AM_CFLAGS += $(CFLAGS_OS_V)
 ASM4FLAGS += -I$(PROJECT_INCLUDE)/rtems
 
-all: ${ARCH} $(TMPINSTALL_FILES)
+all: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES)
 

c/src/exec/sapi/optman/Makefile.am

@@ -32,7 +32,7 @@ $(PROJECT_RELEASE)/lib:
 $(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
 	$(INSTALL_DATA) $< $@
 
-all: ${ARCH} $(TMPINSTALL_FILES)
+all: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES)
 

c/src/lib/libbsp/powerpc/mcp750/wrapup/Makefile.in

@@ -20,10 +20,12 @@ NETWORK = $(NETWORK_$(HAS_NETWORKING)_V)
 BSP_PIECES = clock console irq openpic pci residual startup $(NETWORK) \
     vectors
 GENERIC_PIECES =
+CPU_PIECES = clock
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) $(foreach \
-    piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/*.o)
+    piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/*.o) $(foreach
+    piece, $(CPU_PIECES), ../../../../libcpu/powerpc/mpc750/$(piece)/$(ARCH)/*.o)
 LIB = $(ARCH)/libbsp.a
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg

c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in

@@ -20,10 +20,12 @@ NETWORK = $(NETWORK_$(HAS_NETWORKING)_V)
 BSP_PIECES = clock console irq openpic pci residual startup $(NETWORK) \
     vectors
 GENERIC_PIECES =
+CPU_PIECES = clock
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) $(foreach \
-    piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/*.o)
+    piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/*.o) $(foreach
+    piece, $(CPU_PIECES), ../../../../libcpu/powerpc/mpc750/$(piece)/$(ARCH)/*.o)
 LIB = $(ARCH)/libbsp.a
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg

c/src/make/host.cfg.in

@@ -30,9 +30,13 @@ SED=sed
 # M4=@M4@
 
 # Global tools
+ifndef PACKHEX
 PACKHEX=$(PROJECT_BIN)/packhex
+endif
 
+ifndef INSTALL_CHANGE
 INSTALL_CHANGE=$(PROJECT_BIN)/install-if-change
+endif
 INSTALL_VARIANT=$(INSTALL_CHANGE) -V "$(LIB_VARIANT)"
 
 # FIXME: HACK for a bug in cygwin-hosted egcs which returns a mixture
@@ -71,4 +75,6 @@ INSTLIBFLAGS  = -m 0644
 INSTDIRFLAGS  = -m 0755 -d
 INSTINCFLAGS  = -m 0644
 
+ifndef INSTALL_DATA
 INSTALL_DATA = $(INSTALL) $(INSTDATAFLAGS)
+endif

c/src/optman/rtems/Makefile.am

@@ -33,7 +33,7 @@ $(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
 AM_CFLAGS += $(CFLAGS_OS_V)
 ASM4FLAGS += -I$(PROJECT_INCLUDE)/rtems
 
-all: ${ARCH} $(TMPINSTALL_FILES)
+all: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES)
 

c/src/optman/sapi/Makefile.am

@@ -32,7 +32,7 @@ $(PROJECT_RELEASE)/lib:
 $(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
 	$(INSTALL_DATA) $< $@
 
-all: ${ARCH} $(TMPINSTALL_FILES)
+all: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES)
 

make/custom/gen68360.cfg

@@ -79,10 +79,10 @@ endef
 else
 
 define make-exe
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -o $(basename $@).exe \
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -o $@ \
 	    $(LINK_OBJS) $(LINK_LIBS)
-	$(NM) -g -n $(basename $@).exe > $(basename $@).num
-	$(SIZE) $(basename $@).exe
+	$(NM) -g -n $@ > $(basename $@).num
+	$(SIZE) $@
 endef
 endif
 

make/custom/gensh1.cfg

@@ -72,10 +72,10 @@ endef
 else
 define make-exe
 	$(LINK.c) -Wl,-Map,$(basename $@).map \
-	    $(LDLIBS) -o $(basename $@).exe \
+	    $(LDLIBS) -o $@ \
 	    $(LINK_OBJS) $(LINK_LIBS)
-	$(NM) -n $(basename $@).exe > $(basename $@).num
-	$(SIZE) $(basename $@).exe
+	$(NM) -n $@ > $(basename $@).num
+	$(SIZE) $@
 endef
 endif
 

make/custom/gensh2.cfg

@@ -76,10 +76,10 @@ endef
 else
 define make-exe
 	$(LINK.c) -Wl,-Map,$(basename $@).map \
-	    $(LDLIBS) -o $(basename $@).exe \
+	    $(LDLIBS) -o $@ \
 	    $(LINK_OBJS) $(LINK_LIBS)
-	$(NM) -n $(basename $@).exe > $(basename $@).num
-	$(SIZE) $(basename $@).exe
+	$(NM) -n $@ > $(basename $@).num
+	$(SIZE) $@
 endef
 endif
 

make/host.cfg.in

@@ -30,9 +30,13 @@ SED=sed
 # M4=@M4@
 
 # Global tools
+ifndef PACKHEX
 PACKHEX=$(PROJECT_BIN)/packhex
+endif
 
+ifndef INSTALL_CHANGE
 INSTALL_CHANGE=$(PROJECT_BIN)/install-if-change
+endif
 INSTALL_VARIANT=$(INSTALL_CHANGE) -V "$(LIB_VARIANT)"
 
 # FIXME: HACK for a bug in cygwin-hosted egcs which returns a mixture
@@ -71,4 +75,6 @@ INSTLIBFLAGS  = -m 0644
 INSTDIRFLAGS  = -m 0755 -d
 INSTINCFLAGS  = -m 0644
 
+ifndef INSTALL_DATA
 INSTALL_DATA = $(INSTALL) $(INSTDATAFLAGS)
+endif