Part of automake VI Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>.

> Adds variables to the custom/*cfg files to specify the location of > tools. The purpose is to remove hard-coded paths from the Makefiles. > > In later steps this eases moving the tools to other locations.
1999-02-18 17:54:03 +00:00
parent 1fdc990e98
commit 011677f8fc
15 changed files with 43 additions and 20 deletions
--- a/c/src/make/host.cfg.in
+++ b/c/src/make/host.cfg.in
@@ -30,6 +30,9 @@ CHMOD=@CHMOD@
 SED=@SED@
 M4=@M4@

+# Global tools
+PACKHEX=$(PROJECT_TOOLS)/packhex
+
 INSTALL=$(PROJECT_TOOLS)/install-if-change
 INSTALL_VARIANT=$(PROJECT_TOOLS)/install-if-change -V "$(LIB_VARIANT)"

--- a/make/custom/dmv152.cfg
+++ b/make/custom/dmv152.cfg
@@ -65,7 +65,7 @@ define make-exe
 	    $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group
 	$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
 	$(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
-	    $(PROJECT_TOOLS)/packhex > $(basename $@).exe
+	    $(PACKHEX) > $(basename $@).exe
 	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
 	$(SIZE) $(basename $@).nxe
 endef
@@ -75,7 +75,7 @@ define make-exe
 	    $(LINK_OBJS) $(LINK_LIBS)
 	$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
 	$(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
-	    $(PROJECT_TOOLS)/packhex > $(basename $@).exe
+	    $(PACKHEX) > $(basename $@).exe
 	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
 	$(SIZE) $(basename $@).nxe
 endef
--- a/make/custom/dmv177.cfg
+++ b/make/custom/dmv177.cfg
@@ -110,7 +110,7 @@ define make-exe
 	$(CC) $(CFLAGS) -o $(basename $@).nxe $(LINK_OBJS) $(LINK_LIBS)
 	$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
 	$(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
-	    $(PROJECT_TOOLS)/packhex > $(basename $@).exe
+	    $(PACKHEX) > $(basename $@).exe
 	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
 	$(SIZE) $(basename $@).nxe
 	$(STRIP) $(basename $@).nxe
--- a/make/custom/efi332.cfg
+++ b/make/custom/efi332.cfg
@@ -56,7 +56,7 @@ define make-exe
 	    $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group
 	$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
 	$(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
-	    $(PROJECT_TOOLS)/packhex > $(basename $@).exe
+	    $(PACKHEX) > $(basename $@).exe
 	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
 	$(SIZE) $(basename $@).nxe
 endef
@@ -66,7 +66,7 @@ define make-exe
 	    $(LINK_OBJS) $(LINK_LIBS)
 	$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
 	$(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
-	    $(PROJECT_TOOLS)/packhex > $(basename $@).exe
+	    $(PACKHEX) > $(basename $@).exe
 	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
 	$(SIZE) $(basename $@).nxe
 endef
--- a/make/custom/efi68k.cfg
+++ b/make/custom/efi68k.cfg
@@ -56,7 +56,7 @@ define make-exe
 	    $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group
 	$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
 	$(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
-	    $(PROJECT_TOOLS)/packhex > $(basename $@).exe
+	    $(PACKHEX) > $(basename $@).exe
 	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
 	$(SIZE) $(basename $@).nxe
 endef
@@ -66,7 +66,7 @@ define make-exe
 	    $(LINK_OBJS) $(LINK_LIBS)
 	$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
 	$(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
-	    $(PROJECT_TOOLS)/packhex > $(basename $@).exe
+	    $(PACKHEX) > $(basename $@).exe
 	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
 	$(SIZE) $(basename $@).nxe
 endef
--- a/make/custom/force386.cfg
+++ b/make/custom/force386.cfg
@@ -57,7 +57,7 @@ define make-exe
 	    $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group
 	$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
 	$(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
-	    $(PROJECT_TOOLS)/packhex > $(basename $@).exe
+	    $(PACKHEX) > $(basename $@).exe
 	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
 	$(SIZE) $(basename $@).nxe
 endef
@@ -67,7 +67,7 @@ define make-exe
 	    $(LINK_OBJS) $(LINK_LIBS)
 	$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
 	$(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
-	    $(PROJECT_TOOLS)/packhex > $(basename $@).exe
+	    $(PACKHEX) > $(basename $@).exe
 	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
 	$(SIZE) $(basename $@).nxe
 endef
--- a/make/custom/i386ex.cfg
+++ b/make/custom/i386ex.cfg
@@ -58,7 +58,7 @@ define make-exe
 	    $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group
 	$(OBJCOPY) -O srec $(basename $@).coff $(basename $@).i
 	$(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
-	          $(PROJECT_TOOLS)/packhex > $(basename $@).exe
+	          $(PACKHEX) > $(basename $@).exe
 	$(NM) -g -n $(basename $@).coff > $(basename $@).num
 	$(SIZE) $(basename $@).coff
 endef
@@ -68,7 +68,7 @@ define make-exe
 	    $(LINK_OBJS) $(LINK_LIBS)
 	$(OBJCOPY) -O srec $(basename $@).coff $(basename $@).i
 	$(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
-	          $(PROJECT_TOOLS)/packhex > $(basename $@).exe
+	          $(PACKHEX) > $(basename $@).exe
 	$(NM) -g -n $(basename $@).coff > $(basename $@).num
 	$(SIZE) $(basename $@).coff
 endef
--- a/make/custom/idp.cfg
+++ b/make/custom/idp.cfg
@@ -58,7 +58,7 @@ define make-exe
 	    $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group
 	$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
 	$(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
-	    $(PROJECT_TOOLS)/packhex > $(basename $@).exe
+	    $(PACKHEX) > $(basename $@).exe
 	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
 	$(SIZE) $(basename $@).nxe
 endef
@@ -68,7 +68,7 @@ define make-exe
 	    $(LINK_OBJS) $(LINK_LIBS)
 	$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
 	$(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
-	    $(PROJECT_TOOLS)/packhex > $(basename $@).exe
+	    $(PACKHEX) > $(basename $@).exe
 	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
 	$(SIZE) $(basename $@).nxe
 endef
--- a/make/custom/mvme136.cfg
+++ b/make/custom/mvme136.cfg
@@ -54,7 +54,7 @@ define make-exe
 	    $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group
 	$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
 	$(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
-	    $(PROJECT_TOOLS)/packhex > $(basename $@).exe
+	    $(PACKHEX) > $(basename $@).exe
 	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
 	$(SIZE) $(basename $@).nxe
 endef
@@ -64,7 +64,7 @@ define make-exe
 	    $(LINK_OBJS) $(LINK_LIBS)
 	$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
 	$(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
-	    $(PROJECT_TOOLS)/packhex > $(basename $@).exe
+	    $(PACKHEX) > $(basename $@).exe
 	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
 	$(SIZE) $(basename $@).nxe
 endef
--- a/make/custom/mvme147.cfg
+++ b/make/custom/mvme147.cfg
@@ -51,7 +51,7 @@ define make-exe
 	    $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group
 	$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
 	$(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
-	    $(PROJECT_TOOLS)/packhex > $(basename $@).exe
+	    $(PACKHEX) > $(basename $@).exe
 	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
 	$(SIZE) $(basename $@).nxe
 endef
@@ -61,7 +61,7 @@ define make-exe
 	    $(LINK_OBJS) $(LINK_LIBS)
 	$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
 	$(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
-	    $(PROJECT_TOOLS)/packhex > $(basename $@).exe
+	    $(PACKHEX) > $(basename $@).exe
 	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
 	$(SIZE) $(basename $@).nxe
 endef
--- a/make/custom/mvme162.cfg
+++ b/make/custom/mvme162.cfg
@@ -91,7 +91,7 @@ define make-exe
            --start-group $(LINK_LIBS) --end-group
 	$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
 	$(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
-	    $(PROJECT_TOOLS)/packhex > $(basename $@).exe
+	    $(PACKHEX) > $(basename $@).exe
 	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
 	$(SIZE) $(basename $@).nxe
 endef
@@ -101,9 +101,13 @@ define make-exe
 	    $(LINK_LIBS)
 	$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
 	$(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
-	    $(PROJECT_TOOLS)/packhex > $(basename $@).exe
+	    $(PACKHEX) > $(basename $@).exe
 	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
 	$(SIZE) $(basename $@).nxe
 endef
 endif
+
 # Miscellaneous additions go here
+
+# BSP-specific tools
+SLOAD=$(PROJECT_TOOLS)/sload
--- a/make/custom/pc386.cfg
+++ b/make/custom/pc386.cfg
@@ -76,7 +76,7 @@ define make-exe
 	    --remove-section=.note \
 	    --strip-unneeded $(basename $@).obj $@
 	$(OBJCOPY) -O binary $(basename $@).obj $(basename $@).bin
-	$(PROJECT_TOOLS)/bin2boot -v $(basename $@).bt $(HEADERADDR)\
+	$(BIN2BOOT) -v $(basename $@).bt $(HEADERADDR)\
 	  $(START16FILE) $(START16ADDR) 0 $(basename $@).bin $(RELOCADDR) 0
 	$(NM) -g -n $(basename $@).obj > $(basename $@).num
 	$(SIZE) $(basename $@).obj
@@ -105,3 +105,6 @@ endef
 endif

 # Miscellaneous additions go here
+
+# BSP-specific tools
+BIN2BOOT=$(PROJECT_TOOLS)/bin2boot
--- a/make/custom/posix.cfg
+++ b/make/custom/posix.cfg
@@ -35,3 +35,5 @@ NODE=0
 endif
 endif

+# BSP-specific tools
+GENSIZE=$(PROJECT_RELEASE)/bin/gensize
--- a/make/custom/simhppa.cfg
+++ b/make/custom/simhppa.cfg
@@ -132,3 +132,11 @@ endif
 define make-rel
 	$(LDARGS) $(LD) $(LDFLAGS_INCOMPLETE) $(XLDFLAGS) -o $@ $(OBJS)
 endef
+
+# Miscellaneous additions go here
+
+# BSP-specific tools
+PRINTDUMP=$(PROJECT_TOOLS)/print_dump
+
+# CPU-specific tools
+GENOFFSETS=$(PROJECT_RELEASE)/bin/genoffsets
--- a/make/host.cfg.in
+++ b/make/host.cfg.in
@@ -30,6 +30,9 @@ CHMOD=@CHMOD@
 SED=@SED@
 M4=@M4@

+# Global tools
+PACKHEX=$(PROJECT_TOOLS)/packhex
+
 INSTALL=$(PROJECT_TOOLS)/install-if-change
 INSTALL_VARIANT=$(PROJECT_TOOLS)/install-if-change -V "$(LIB_VARIANT)"